diff --git a/lib/GameLoader.js b/lib/GameLoader.js
index <HASH>..<HASH> 100644
--- a/lib/GameLoader.js
+++ b/lib/GameLoader.js
@@ -890,12 +890,17 @@ GameLoader.prototype.buildWaitRoomConf = function(directory, gameName, level) {
     waitRoomSettingsFile = directory + 'waitroom/waitroom.settings.js';
 
     if (!fs.existsSync(waitRoomSettingsFile)) {
+        ///////////////////////////////////////////////////////
+        // Experimental code for levels without waitroom conf.
         this.doErr('GameLoader.buildWaitRoomConf: file waitroom.settings ' +
                    'not found', {
                        game: gameName,
                        level: level,
-                       log: 'warn'
-                  });
+                       log: 'warn',
+                       throwIt: !level // Experimental: was always true.
+                   });
+        // Important! The main waitRoom has not been loaded yet, so levels
+        // cannot copy settings from there.
         return;
     }
allowing no waitroom in levels: will cause an error for now if trying to move to a level. need further work