diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
index 1ac12ec84e..69a518ba25 100644
--- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
@@ -182,7 +182,7 @@ module.exports = ProjectEntityHandler =
 	_addDocWithProject: (project, folder_id, docName, docLines, userId, callback = (error, doc, folder_id, path) ->)=>
 		# check if docname is allowed
 		if not SafePath.isCleanFilename docName
-			return callback new Error("invalid element name")
+			return callback new Errors.InvalidNameError("invalid element name")
 		project_id = project._id
 		logger.log project_id: project_id, folder_id: folder_id, doc_name: docName, "adding doc to project with project"
 		confirmFolder project, folder_id, (folder_id)=>
@@ -207,7 +207,7 @@ module.exports = ProjectEntityHandler =
 	restoreDoc: (project_id, doc_id, name, callback = (error, doc, folder_id) ->) ->
 		# check if docname is allowed (passed in from client so we check it)
 		if not SafePath.isCleanFilename name
-			return callback new Error("invalid element name")
+			return callback new Errors.InvalidNameError("invalid element name")
 		# getDoc will return the deleted doc's lines, but we don't actually remove
 		# the deleted doc, just create a new one from its lines.
 		ProjectEntityHandler.getDoc project_id, doc_id, include_deleted: true, (error, lines) ->
@@ -217,7 +217,7 @@ module.exports = ProjectEntityHandler =
 	addFileWithoutUpdatingHistory: (project_id, folder_id, fileName, path, userId, callback = (error, fileRef, folder_id, path, fileStoreUrl) ->)->
 		# check if file name is allowed
 		if not SafePath.isCleanFilename fileName
-			return callback new Error("invalid element name")
+			return callback new Errors.InvalidNameError("invalid element name")
 		ProjectGetter.getProject project_id, {rootFolder:true, name:true}, (err, project) ->
 			if err?
 				logger.err project_id:project_id, err:err, "error getting project for add file"
@@ -362,7 +362,7 @@ module.exports = ProjectEntityHandler =
 	addFolderWithProject: (project, parentFolder_id, folderName, callback = (err, folder, parentFolder_id)->) ->
 		# check if folder name is allowed
 		if not SafePath.isCleanFilename folderName
-			return callback new Error("invalid element name")
+			return callback new Errors.InvalidNameError("invalid element name")
 		confirmFolder project, parentFolder_id, (parentFolder_id)=>
 			folder = new Folder name: folderName
 			logger.log project: project._id, parentFolder_id:parentFolder_id, folderName:folderName, "adding new folder"
@@ -466,7 +466,7 @@ module.exports = ProjectEntityHandler =
 	renameEntity: (project_id, entity_id, entityType, newName, userId, callback)->
 		# check if name is allowed
 		if not SafePath.isCleanFilename newName
-			return callback new Error("invalid element name")
+			return callback new Errors.InvalidNameError("invalid element name")
 		logger.log(entity_id: entity_id, project_id: project_id, ('renaming '+entityType))
 		if !entityType?
 			logger.err err: "No entityType set", project_id: project_id, entity_id: entity_id
@@ -613,7 +613,7 @@ module.exports = ProjectEntityHandler =
 		# original check path.resolve("/", element.name) isnt "/#{element.name}" or element.name.match("/")
 		# check if name is allowed
 		if not SafePath.isCleanFilename element.name
-			e = new Error("invalid element name")
+			e = new Errors.InvalidNameError("invalid element name")
 			logger.err project_id:project._id, folder_id:folder_id, element:element, type:type, "failed trying to insert element as name was invalid"
 			return callback(e)