diff --git a/services/web/app/coffee/managers/NewsletterManager.coffee b/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee
similarity index 100%
rename from services/web/app/coffee/managers/NewsletterManager.coffee
rename to services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee
diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionViewModelBuilder.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionViewModelBuilder.coffee
index 340863a405..74f91a8dad 100644
--- a/services/web/app/coffee/Features/Subscription/SubscriptionViewModelBuilder.coffee
+++ b/services/web/app/coffee/Features/Subscription/SubscriptionViewModelBuilder.coffee
@@ -38,6 +38,8 @@ module.exports =
 	buildViewModel : ->
 		plans = Settings.plans
 
+		console.log plans
+		console.log(typeof(plans))
 		allPlans = {}
 		plans.forEach (plan)->
 			allPlans[plan.planCode] = plan
diff --git a/services/web/app/coffee/Features/User/UserDeleter.coffee b/services/web/app/coffee/Features/User/UserDeleter.coffee
index 56ff06df4c..7361c7ab56 100644
--- a/services/web/app/coffee/Features/User/UserDeleter.coffee
+++ b/services/web/app/coffee/Features/User/UserDeleter.coffee
@@ -1,5 +1,5 @@
 User = require("../../models/User").User
-NewsletterManager = require "../../managers/NewsletterManager"
+NewsletterManager = require "../Newsletter/NewsletterManager"
 ProjectDeleter = require("../Project/ProjectDeleter")
 logger = require("logger-sharelatex")
 SubscriptionHandler = require("../Subscription/SubscriptionHandler")
diff --git a/services/web/app/coffee/controllers/UserController.coffee b/services/web/app/coffee/controllers/UserController.coffee
index e00a075c37..63c0837009 100644
--- a/services/web/app/coffee/controllers/UserController.coffee
+++ b/services/web/app/coffee/controllers/UserController.coffee
@@ -5,7 +5,7 @@ _ = require('underscore')
 logger = require('logger-sharelatex')
 Security = require('../managers/SecurityManager')
 Settings = require('settings-sharelatex')
-newsLetterManager = require('../managers/NewsletterManager')
+newsLetterManager = require('../Features/Newsletter/NewsletterManager')
 dropboxHandler = require('../Features/Dropbox/DropboxHandler')
 userRegistrationHandler = require('../Features/User/UserRegistrationHandler')
 metrics = require('../infrastructure/Metrics')
diff --git a/services/web/app/coffee/managers/SecurityManager.coffee b/services/web/app/coffee/managers/SecurityManager.coffee
index 38d7bdabef..1f757fd9c2 100644
--- a/services/web/app/coffee/managers/SecurityManager.coffee
+++ b/services/web/app/coffee/managers/SecurityManager.coffee
@@ -166,7 +166,9 @@ getRequestUserAndProject = (req, res, options, callback)->
 			callback err, user, project
 
 getProjectIdFromRef = (ref)->
-	if ref._id?
+	if !ref?
+		return null
+	else if ref._id?
 		return ref._id+''
 	else
 		return ref+''
diff --git a/services/web/test/UnitTests/coffee/User/UserDeleterTests.coffee b/services/web/test/UnitTests/coffee/User/UserDeleterTests.coffee
index 79a7b965c4..34fabda11c 100644
--- a/services/web/test/UnitTests/coffee/User/UserDeleterTests.coffee
+++ b/services/web/test/UnitTests/coffee/User/UserDeleterTests.coffee
@@ -25,7 +25,7 @@ describe "UserDeleter", ->
 			cancelSubscription: sinon.stub().callsArgWith(1)
 		@UserDeleter = SandboxedModule.require modulePath, requires:
 			"../../models/User": User: @User
-			"../../managers/NewsletterManager":  @NewsletterManager
+			"../Newsletter/NewsletterManager":  @NewsletterManager
 			"../Subscription/SubscriptionHandler": @SubscriptionHandler
 			"../Project/ProjectDeleter": @ProjectDeleter