diff --git a/services/web/app/coffee/Features/Uploads/FileTypeManager.coffee b/services/web/app/coffee/Features/Uploads/FileTypeManager.coffee
index 44eed12db5..0c858af75a 100644
--- a/services/web/app/coffee/Features/Uploads/FileTypeManager.coffee
+++ b/services/web/app/coffee/Features/Uploads/FileTypeManager.coffee
@@ -24,7 +24,8 @@ module.exports = FileTypeManager =
 
 	isDirectory: (path, callback = (error, result) ->) ->
 		fs.stat path, (error, stats) ->
-			callback(error, stats.isDirectory())
+			return callback(error) if error?
+			callback(null, stats?.isDirectory())
 
 	isBinary: (name, fsPath, callback = (error, result) ->) ->
 		parts = name.split(".")