diff --git a/services/web/app/coffee/Features/Compile/ClsiManager.coffee b/services/web/app/coffee/Features/Compile/ClsiManager.coffee
index a0e03c2226..473df0f5cd 100755
--- a/services/web/app/coffee/Features/Compile/ClsiManager.coffee
+++ b/services/web/app/coffee/Features/Compile/ClsiManager.coffee
@@ -44,7 +44,11 @@ module.exports = ClsiManager =
 				if err?
 					logger.err err:err, project_id:project_id, url:opts?.url, "error making request to clsi"
 					return callback(err)
-				ClsiCookieManager.setServerId project_id, response, callback
+				ClsiCookieManager.setServerId project_id, response, (err)->
+					if err?
+						logger.warn err:err, project_id:project_id, "error setting server id"
+						
+					return callback err, response, body
 
 
 	_getCompilerUrl: (compileGroup) ->
diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee
index 934f9e97a4..6ffca6affe 100755
--- a/services/web/app/coffee/Features/Compile/CompileController.coffee
+++ b/services/web/app/coffee/Features/Compile/CompileController.coffee
@@ -33,7 +33,7 @@ module.exports = CompileController =
 			CompileManager.compile project_id, user_id, options, (error, status, outputFiles, output, limits) ->
 				return next(error) if error?
 				res.contentType("application/json")
-				res.send 200, JSON.stringify {
+				res.status(200).send JSON.stringify {
 					status: status
 					outputFiles: outputFiles
 					compileGroup: limits?.compileGroup
diff --git a/services/web/test/UnitTests/coffee/helpers/MockResponse.coffee b/services/web/test/UnitTests/coffee/helpers/MockResponse.coffee
index a7182c9df0..5ed7c58522 100644
--- a/services/web/test/UnitTests/coffee/helpers/MockResponse.coffee
+++ b/services/web/test/UnitTests/coffee/helpers/MockResponse.coffee
@@ -63,6 +63,10 @@ class MockResponse
 		@body = body if body
 		@callback() if @callback?
 
+	status: (@statusCode)->
+		return @
+
+
 	setHeader: (header, value) ->
 		@headers[header] = value