diff --git a/services/filestore/app/coffee/FileHandler.coffee b/services/filestore/app/coffee/FileHandler.coffee
index 718195a484..93cad984dd 100644
--- a/services/filestore/app/coffee/FileHandler.coffee
+++ b/services/filestore/app/coffee/FileHandler.coffee
@@ -47,10 +47,12 @@ module.exports =
 
 	_getConvertedFileAndCache: (bucket, key, convertedKey, opts, callback)->
 		convertedFsPath = ""
+		originalFsPath = ""
 		async.series [
 			(cb) =>
-				@_convertFile bucket, key, opts, (err, fileSystemPath) ->
+				@_convertFile bucket, key, opts, (err, fileSystemPath, originalFsPath) ->
 					convertedFsPath = fileSystemPath
+					originalFsPath = originalFsPath
 					cb err
 			(cb)->
 				ImageOptimiser.compressPng convertedFsPath, cb
@@ -58,6 +60,8 @@ module.exports =
 				PersistorManager.sendFile bucket, convertedKey, convertedFsPath, cb
 		], (err)->
 			if err?
+				LocalFileWriter.deleteFile convertedFsPath, ->
+				LocalFileWriter.deleteFile originalFsPath, ->
 				return callback(err)
 			PersistorManager.getFileStream bucket, convertedKey, opts, callback
 
@@ -70,7 +74,7 @@ module.exports =
 					logger.err err:err, bucket:bucket, originalKey:originalKey, opts:opts, "error converting file"
 					return callback(err)
 				LocalFileWriter.deleteFile originalFsPath, ->
-				callback(err, destPath)
+				callback(err, destPath, originalFsPath)
 
 			if opts.format?
 				FileConverter.convert originalFsPath, opts.format, done
diff --git a/services/filestore/app/coffee/ImageOptimiser.coffee b/services/filestore/app/coffee/ImageOptimiser.coffee
index be3fed1ca2..33c8cc8d56 100644
--- a/services/filestore/app/coffee/ImageOptimiser.coffee
+++ b/services/filestore/app/coffee/ImageOptimiser.coffee
@@ -8,7 +8,7 @@ module.exports =
 		logger.log localPath:localPath, "optimising png path"
 		args = "optipng #{localPath}"
 		opts =
-			timeout: 20 * 1000
+			timeout: 30 * 1000
 			killSignal: "SIGKILL"
 		exec args, opts,(err, stdout, stderr)->
 			if err?