diff --git a/src/routes/user.js b/src/routes/user.js
index b43d770f5c..c0a96e80bb 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -207,11 +207,6 @@ var user = require('./../user.js'),
 			is.on('end', function () {
 				fs.unlinkSync(tempPath);
 
-				var imageUrl = nconf.get('upload_url') + filename;
-
-				user.setUserField(uid, 'uploadedpicture', imageUrl);
-				user.setUserField(uid, 'picture', imageUrl);
-
 				require('node-imagemagick').crop({
 					srcPath: uploadPath,
 					dstPath: uploadPath,
@@ -220,8 +215,17 @@ var user = require('./../user.js'),
 				}, function (err, stdout, stderr) {
 					if (err) {
 						winston.err(err);
+						res.send({
+							error: 'Invalid image file!'
+						});
+						return;
 					}
 
+					var imageUrl = nconf.get('upload_url') + filename;
+
+					user.setUserField(uid, 'uploadedpicture', imageUrl);
+					user.setUserField(uid, 'picture', imageUrl);
+
 					res.json({
 						path: imageUrl
 					});