diff --git a/services/web/app.coffee b/services/web/app.coffee
index 8496af8f17..d8590689b3 100644
--- a/services/web/app.coffee
+++ b/services/web/app.coffee
@@ -10,7 +10,6 @@ metrics = require("metrics-sharelatex")
 metrics.initialize("web")
 metrics.memory.monitor(logger)
 Server = require("./app/js/infrastructure/Server")
-Errors = require "./app/js/errors"
 
 argv = require("optimist")
 	.options("user", {alias : "u", description : "Run the server with permissions of the specified user"})
diff --git a/services/web/app/coffee/Features/Documents/DocumentController.coffee b/services/web/app/coffee/Features/Documents/DocumentController.coffee
index 8cae627ab6..ba74fc47da 100644
--- a/services/web/app/coffee/Features/Documents/DocumentController.coffee
+++ b/services/web/app/coffee/Features/Documents/DocumentController.coffee
@@ -1,5 +1,4 @@
 ProjectEntityHandler = require "../Project/ProjectEntityHandler"
-Errors = require "../../errors"
 logger = require("logger-sharelatex")
 
 module.exports =
diff --git a/services/web/app/coffee/Features/Errors/ErrorController.coffee b/services/web/app/coffee/Features/Errors/ErrorController.coffee
index 255c747bea..16b160642a 100644
--- a/services/web/app/coffee/Features/Errors/ErrorController.coffee
+++ b/services/web/app/coffee/Features/Errors/ErrorController.coffee
@@ -14,7 +14,7 @@ module.exports = ErrorController =
 	
 	handleError: (error, req, res, next) ->
 		if error?.code is 'EBADCSRFTOKEN'
-			logger.log err: error,url:req.url, method:req.method, user:req?.sesson?.user, "invalid csrf"
+			logger.warn err: error,url:req.url, method:req.method, user:req?.sesson?.user, "invalid csrf"
 			res.sendStatus(403)
 			return
 		if error instanceof Errors.NotFoundError
diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
index e039f60ca6..946a57d527 100644
--- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
@@ -4,7 +4,7 @@ Doc = require('../../models/Doc').Doc
 Folder = require('../../models/Folder').Folder
 File = require('../../models/File').File
 FileStoreHandler = require("../FileStore/FileStoreHandler")
-Errors = require "../../errors"
+Errors = require "../Errors/Errors"
 tpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender')
 projectLocator = require('./ProjectLocator')
 path = require "path"
diff --git a/services/web/app/coffee/Features/Project/ProjectGetter.coffee b/services/web/app/coffee/Features/Project/ProjectGetter.coffee
index ff95c02c40..af6178d06b 100644
--- a/services/web/app/coffee/Features/Project/ProjectGetter.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectGetter.coffee
@@ -3,7 +3,6 @@ db = mongojs.db
 ObjectId = mongojs.ObjectId
 async = require "async"
 Project = require("../../models/Project").Project
-Errors = require("../../errors")
 logger = require("logger-sharelatex")
 
 module.exports = ProjectGetter =
diff --git a/services/web/app/coffee/Features/Project/ProjectLocator.coffee b/services/web/app/coffee/Features/Project/ProjectLocator.coffee
index cd4adad142..36d9203ebe 100644
--- a/services/web/app/coffee/Features/Project/ProjectLocator.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectLocator.coffee
@@ -1,6 +1,6 @@
 Project = require('../../models/Project').Project
 ProjectGetter = require("./ProjectGetter")
-Errors = require "../../errors"
+Errors = require "../Errors/Errors"
 _ = require('underscore')
 logger = require('logger-sharelatex')
 async = require('async')
diff --git a/services/web/app/coffee/errors.coffee b/services/web/app/coffee/errors.coffee
deleted file mode 100644
index 4a29822efc..0000000000
--- a/services/web/app/coffee/errors.coffee
+++ /dev/null
@@ -1,10 +0,0 @@
-NotFoundError = (message) ->
-	error = new Error(message)
-	error.name = "NotFoundError"
-	error.__proto__ = NotFoundError.prototype
-	return error
-NotFoundError.prototype.__proto__ = Error.prototype
-
-module.exports = Errors =
-	NotFoundError: NotFoundError
-
diff --git a/services/web/app/coffee/models/Project.coffee b/services/web/app/coffee/models/Project.coffee
index 6397025da5..1d53999bd9 100644
--- a/services/web/app/coffee/models/Project.coffee
+++ b/services/web/app/coffee/models/Project.coffee
@@ -5,7 +5,7 @@ FolderSchema = require('./Folder.js').FolderSchema
 logger = require('logger-sharelatex')
 sanitize = require('sanitizer')
 concreteObjectId = require('mongoose').Types.ObjectId
-Errors  = require "../errors"
+Errors  = require "../Features/Errors/Errors"
 
 
 Schema = mongoose.Schema
diff --git a/services/web/test/UnitTests/coffee/Documents/DocumentControllerTests.coffee b/services/web/test/UnitTests/coffee/Documents/DocumentControllerTests.coffee
index ee1360fa0a..1a7e2fb500 100644
--- a/services/web/test/UnitTests/coffee/Documents/DocumentControllerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Documents/DocumentControllerTests.coffee
@@ -7,7 +7,7 @@ SandboxedModule = require('sandboxed-module')
 events = require "events"
 MockRequest = require "../helpers/MockRequest"
 MockResponse = require "../helpers/MockResponse"
-Errors = require "../../../../app/js/errors"
+Errors = require "../../../../app/js/Features/Errors/Errors"
 
 describe "DocumentController", ->
 	beforeEach ->
diff --git a/services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee b/services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee
index 0e2441cf8d..e946850828 100644
--- a/services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Project/ProjectEntityHandlerTests.coffee
@@ -7,7 +7,7 @@ modulePath = "../../../../app/js/Features/Project/ProjectEntityHandler"
 SandboxedModule = require('sandboxed-module')
 ObjectId = require("mongoose").Types.ObjectId
 tk = require 'timekeeper'
-Errors = require "../../../../app/js/errors"
+Errors = require "../../../../app/js/Features/Errors/Errors"
 
 describe 'ProjectEntityHandler', ->
 	project_id = '4eecb1c1bffa66588e0000a1'
diff --git a/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee b/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
index 1feef45571..15a86d235c 100644
--- a/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
+++ b/services/web/test/UnitTests/coffee/Project/ProjectLocatorTests.coffee
@@ -5,7 +5,7 @@ should = chai.should()
 modulePath = "../../../../app/js/Features/Project/ProjectLocator"
 SandboxedModule = require('sandboxed-module')
 sinon = require('sinon')
-Errors = require "../../../../app/js/errors"
+Errors = require "../../../../app/js/Features/Errors/Errors"
 expect = require("chai").expect
 Project = class Project