diff --git a/main/Main.scala b/main/Main.scala
index b6a746538..e6e0e2e2b 100644
--- a/main/Main.scala
+++ b/main/Main.scala
@@ -370,6 +370,7 @@ object BuiltinCommands
 		IO.createDirectory(base)
 		val (eval, structure) = Load.defaultLoad(s, base, logger(s))
 		val session = Load.initialSession(structure, eval)
+		SessionSettings.checkSession(session, s)
 		Project.setProject(session, structure, s)
 	}
 	
diff --git a/main/Project.scala b/main/Project.scala
index 1be09a931..fb467fa91 100644
--- a/main/Project.scala
+++ b/main/Project.scala
@@ -140,7 +140,6 @@ object Project extends Init[Scope] with ProjectExtra
 
 	def setProject(session: SessionSettings, structure: BuildStructure, s: State): State =
 	{
-		SessionSettings.checkSession(session, s)
 		val previousOnUnload = orIdentity(s get Keys.onUnload.key)
 		val unloaded = previousOnUnload(s.runExitHooks())
 		val (onLoad, onUnload) = getHooks(structure.data)