diff --git a/services/web/app/coffee/Features/Project/ProjectLocator.coffee b/services/web/app/coffee/Features/Project/ProjectLocator.coffee
index 26f4b3b3cd..3a415b144a 100644
--- a/services/web/app/coffee/Features/Project/ProjectLocator.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectLocator.coffee
@@ -17,7 +17,7 @@ module.exports =
 
 		search = (searchFolder, path)->
 			count++
-			element = _.find searchFolder[elementType], (el)-> el._id+'' == element_id+'' #need to ToString both id's for robustness
+			element = _.find searchFolder[elementType], (el)-> el?._id+'' == element_id+'' #need to ToString both id's for robustness
 			if !element? && searchFolder.folders? && searchFolder.folders.length != 0
 				_.each searchFolder.folders, (folder, index)->
 					newPath = {}
@@ -136,6 +136,6 @@ getIndexOf = (searchEntity, id)->
 	length = searchEntity.length
 	count = 0
 	while(count < length)
-		if searchEntity[count]._id+"" == id+""
+		if searchEntity[count]?._id+"" == id+""
 			return count
 		count++
diff --git a/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee b/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
index 6906945384..43a3acad01 100644
--- a/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
+++ b/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
@@ -22,7 +22,7 @@ subFolder1 = name:"subFolder1", _id:"123asdjoij"
 
 rootFolder =
 	_id : "123sdskd"
-	docs:[doc1, doc2, rootDoc]
+	docs:[doc1, doc2, null, rootDoc]
 	fileRefs:[file1]
 	folders:[subFolder1, subFolder]