diff --git a/services/docstore/app/coffee/HttpController.coffee b/services/docstore/app/coffee/HttpController.coffee
index 781376b5a5..5a4115699e 100644
--- a/services/docstore/app/coffee/HttpController.coffee
+++ b/services/docstore/app/coffee/HttpController.coffee
@@ -18,7 +18,11 @@ module.exports = HttpController =
 		logger.log project_id: project_id, "getting all docs"
 		DocManager.getAllDocs project_id, (error, docs = []) ->
 			return next(error) if error?
-			res.json docs.map(HttpController._buildDocView)
+			docViews = []
+			for doc in docs
+				if doc? # There can end up being null docs for some reason :( (probably a race condition)
+					docViews.push HttpController._buildDocView(doc)
+			res.json docViews
 
 	updateDoc: (req, res, next = (error) ->) ->
 		project_id = req.params.project_id