diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js
index 8cdf5f81f3..cbf6e7f650 100644
--- a/src/controllers/admin/uploads.js
+++ b/src/controllers/admin/uploads.js
@@ -3,6 +3,7 @@
 var fs = require('fs'),
 	path = require('path'),
 	nconf = require('nconf'),
+	winston = require('winston'),
 	file = require('../../file'),
 	plugins = require('../../plugins');
 
@@ -17,7 +18,11 @@ uploadsController.uploadCategoryPicture = function(req, res, next) {
 	try {
 		params = JSON.parse(req.body.params);
 	} catch (e) {
-		fs.unlink(uploadedFile.path);
+		fs.unlink(uploadedFile.path, function(err) {
+			if (err) {
+				winston.error(err);
+			}
+		});
 		return next(e);
 	}
 
@@ -33,7 +38,11 @@ uploadsController.uploadFavicon = function(req, res, next) {
 
 	if (validateUpload(req, res, next, uploadedFile, allowedTypes)) {
 		file.saveFileToLocal('favicon.ico', 'system', uploadedFile.path, function(err, image) {
-			fs.unlink(uploadedFile.path);
+			fs.unlink(uploadedFile.path, function(err) {
+				if (err) {
+					winston.error(err);
+				}
+			});
 			if (err) {
 				return next(err);
 			}
@@ -62,7 +71,11 @@ function upload(name, req, res, next) {
 
 function validateUpload(req, res, next, uploadedFile, allowedTypes) {
 	if (allowedTypes.indexOf(uploadedFile.type) === -1) {
-		fs.unlink(uploadedFile.path);
+		fs.unlink(uploadedFile.path, function(err) {
+			if (err) {
+				winston.error(err);
+			}
+		});
 
 		res.json({error: '[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]'});
 		return false;
@@ -73,7 +86,11 @@ function validateUpload(req, res, next, uploadedFile, allowedTypes) {
 
 function uploadImage(filename, folder, uploadedFile, req, res, next) {
 	function done(err, image) {
-		fs.unlink(uploadedFile.path);
+		fs.unlink(uploadedFile.path, function(err) {
+			if (err) {
+				winston.error(err);
+			}
+		});
 		if (err) {
 			return next(err);
 		}
diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 1c99026463..be5d80bf23 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -136,9 +136,14 @@ function uploadFile(uid, uploadedFile, callback) {
 }
 
 function deleteTempFiles(files) {
-	for(var i=0; i<files.length; ++i) {
-		fs.unlink(files[i].path);
-	}
+	async.each(files, function(file, next) {
+		fs.unlink(file.path, function(err) {
+			if (err) {
+				winston.error(err);
+			}
+			next();
+		});
+	});
 }
 
 
diff --git a/src/user/picture.js b/src/user/picture.js
index 80b565217a..68b3d90431 100644
--- a/src/user/picture.js
+++ b/src/user/picture.js
@@ -101,7 +101,11 @@ module.exports = function(User) {
 			}
 
 			User.uploadPicture(uid, downloadedImage, function(err, image) {
-				fs.unlink(filename);
+				fs.unlink(filename, function(err) {
+					if (err) {
+						winston.error(err);
+					}
+				});
 				callback(err, image);
 			});
 		});