From c920874872fad26b67f36917a241e8790590df98 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Mon, 10 Nov 2014 11:26:40 +0000
Subject: [PATCH] added null check to compile features

---
 .../web/app/coffee/Features/Compile/CompileController.coffee  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee
index 670cb4bec9..387c9eb950 100755
--- a/services/web/app/coffee/Features/Compile/CompileController.coffee
+++ b/services/web/app/coffee/Features/Compile/CompileController.coffee
@@ -18,8 +18,8 @@ module.exports = CompileController =
 		AuthenticationController.getLoggedInUserId req, (error, user_id) ->
 			return next(error) if error?
 			UserGetter.getUser user_id, {"features.compileGroup":1, "features.compileTimeout":1}, (err, user)->
-				settingsOverride.timeout = user.features.compileTimeout || Settings.defaultFeatures.compileTimeout
-				settingsOverride.compiler = user.features.compileGroup || Settings.defaultFeatures.compileGroup
+				settingsOverride.timeout = user?.features?.compileTimeout || Settings.defaultFeatures.compileTimeout
+				settingsOverride.compiler = user?.features?.compileGroup || Settings.defaultFeatures.compileGroup
 				req.session.compileGroup = settingsOverride.compiler
 				CompileManager.compile project_id, user_id, { isAutoCompile, settingsOverride }, (error, status, outputFiles) ->
 					return next(error) if error?