diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json
index 091bdf359f..36daa3d044 100644
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -50,6 +50,7 @@
 	"flag_manage_history_assignee": "Assigned to %1",
 	"flag_manage_history_state": "Updated state to %1",
 	"flag_manage_history_notes": "Updated flag notes",
+	"flag_manage_saved": "Flag Details Updated",
 
 	"deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
 
diff --git a/public/src/admin/manage/flags.js b/public/src/admin/manage/flags.js
index 12327526ca..ae44e9232c 100644
--- a/public/src/admin/manage/flags.js
+++ b/public/src/admin/manage/flags.js
@@ -190,7 +190,11 @@ define('admin/manage/flags', [
 			pid: pid,
 			data: formData
 		}, function(err) {
-			console.log(arguments);
+			if (err) {
+				return app.alertError(err.message);
+			} else {
+				app.alertSuccess('[[topic:flag_manage_saved]]');
+			}
 		});
 	}
 
diff --git a/src/posts/flags.js b/src/posts/flags.js
index 82ea31dd00..424a54084f 100644
--- a/src/posts/flags.js
+++ b/src/posts/flags.js
@@ -273,6 +273,10 @@ module.exports = function(Posts) {
 		var prop;
 
 		Posts.getPostData(pid, function(err, postData) {
+			if (err) {
+				return callback(err);
+			}
+
 			// Track new additions
 			for(prop in flagObj) {
 				if (flagObj.hasOwnProperty(prop) && !postData.hasOwnProperty('flag:' + prop)) {
@@ -378,6 +382,10 @@ module.exports = function(Posts) {
 					next(err, event);
 				})
 			}, function(err, history) {
+				if (err) {
+					return next(err);
+				}
+
 				post['flag:history'] = history;
 				next(null, post);
 			});