diff --git a/services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee
index 2de6eadda0..338c660c0c 100644
--- a/services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee
@@ -1,3 +1,5 @@
+_ = require("underscore")
+
 module.exports = ProjectEditorHandler =
 	buildProjectModelView: (project, options) ->
 		options ||= {}
@@ -55,10 +57,11 @@ module.exports = ProjectEditorHandler =
 		signUpDate : user.signUpDate
 
 	buildFolderModelView: (folder) ->
+		fileRefs = _.filter folder.fileRefs, (file)-> file?
 		_id        : folder._id
 		name       : folder.name
 		folders    : @buildFolderModelView childFolder for childFolder in folder.folders
-		fileRefs   : @buildFileModelView file for file in folder.fileRefs
+		fileRefs   : @buildFileModelView file for file in fileRefs
 		docs       : @buildDocModelView doc for doc in folder.docs
 
 	buildFileModelView: (file) ->
diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
index 8cf3d2e7a8..758115bcf1 100644
--- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
@@ -64,7 +64,8 @@ module.exports = ProjectEntityHandler =
 			files = {}
 			for folderPath, folder of folders
 				for file in folder.fileRefs
-					files[path.join(folderPath, file.name)] = file
+					if file?
+						files[path.join(folderPath, file.name)] = file
 			callback null, files
 
 	flushProjectToThirdPartyDataStore: (project_id, callback) ->