diff --git a/app/coffee/LockManager.coffee b/app/coffee/LockManager.coffee
index 2a8777f..afa3cca 100644
--- a/app/coffee/LockManager.coffee
+++ b/app/coffee/LockManager.coffee
@@ -15,16 +15,17 @@ module.exports = LockManager =
 			pollPeriod: @LOCK_TEST_INTERVAL
 			stale: @LOCK_STALE
 		Lockfile.lock path, lockOpts, (error) ->
-			return callback new Errors.AlreadyCompilingError("compile in progress")	if error?.code is 'EEXIST'
-				if error?
-					fs.lstat path, (statLockErr, statLock)->
-						fs.lstat Path.dirname(path), (statDirErr, statDir)->
-							fs.readdir Path.dirname(path), (readdirErr, readdirDir)->
+			if error?.code is 'EEXIST'
+				return callback new Errors.AlreadyCompilingError("compile in progress")
+			else if error?
+				fs.lstat path, (statLockErr, statLock)->
+					fs.lstat Path.dirname(path), (statDirErr, statDir)->
+						fs.readdir Path.dirname(path), (readdirErr, readdirDir)->
 							logger.err error:error, path:path, statLock:statLock, statLockErr:statLockErr, statDir:statDir, statDirErr: statDirErr, readdirErr:readdirErr, readdirDir:readdirDir, "unable to get lock"
 							return callback(error)
-				else
-					runner (error1, args...) ->
-						Lockfile.unlock path, (error2) ->
-							error = error1 or error2
-							return callback(error) if error?
-							callback(null, args...)
+			else
+				runner (error1, args...) ->
+					Lockfile.unlock path, (error2) ->
+						error = error1 or error2
+						return callback(error) if error?
+						callback(null, args...)
diff --git a/test/unit/coffee/LockManagerTests.coffee b/test/unit/coffee/LockManagerTests.coffee
index ab9ce93..9dd1d46 100644
--- a/test/unit/coffee/LockManagerTests.coffee
+++ b/test/unit/coffee/LockManagerTests.coffee
@@ -9,9 +9,10 @@ describe "DockerLockManager", ->
 	beforeEach ->
 		@LockManager = SandboxedModule.require modulePath, requires:
 			"settings-sharelatex": {}
-			"logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub() }
+			"logger-sharelatex": @logger = { log: sinon.stub(), error: sinon.stub(), err:-> }
 			"fs":
 				lstat:sinon.stub().callsArgWith(1)
+				readdir: sinon.stub().callsArgWith(1)
 			"lockfile": @Lockfile = {}
 		@lockFile = "/local/compile/directory/.project-lock"