diff --git a/services/filestore/app/coffee/FileHandler.coffee b/services/filestore/app/coffee/FileHandler.coffee
index aa9602b5a8..8968470300 100644
--- a/services/filestore/app/coffee/FileHandler.coffee
+++ b/services/filestore/app/coffee/FileHandler.coffee
@@ -11,9 +11,9 @@ module.exports =
 
 	insertFile: (bucket, key, stream, callback)->
 		convetedKey = KeyBuilder.getConvertedFolderKey(key)
-		PersistorManager.deleteDirectory bucket, convetedKey, ->
-			PersistorManager.sendStream bucket, key, stream, ->
-				callback()
+		PersistorManager.deleteDirectory bucket, convetedKey, (error) ->
+			return callback(error) if error?
+			PersistorManager.sendStream bucket, key, stream, callback
 
 	deleteFile: (bucket, key, callback)->
 		convetedKey = KeyBuilder.getConvertedFolderKey(bucket, key)
diff --git a/services/filestore/app/coffee/S3PersistorManager.coffee b/services/filestore/app/coffee/S3PersistorManager.coffee
index fbbd673499..dead151905 100644
--- a/services/filestore/app/coffee/S3PersistorManager.coffee
+++ b/services/filestore/app/coffee/S3PersistorManager.coffee
@@ -102,7 +102,7 @@ module.exports =
 
 	deleteDirectory: (bucketName, key, _callback)->
 		callback = (args...) ->
-			logger.log key: key, bucketName: bucketName, "calling delete callback"
+			logger.log key: key, bucketName: bucketName, args: args, "calling delete callback"
 			_callback(args...)
 
 		logger.log key: key, bucketName: bucketName, "deleting directory"