diff --git a/DoorShuffle.py b/DoorShuffle.py
index ac81c5e9..c6d17863 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -55,6 +55,9 @@ def link_doors(world, player):
         cross_dungeon(world, player)
     elif world.doorShuffle[player] == 'experimental':
         experiment(world, player)
+    else:
+        logging.getLogger('').error('Invalid door shuffle setting: %s' % world.doorShuffle[player])
+        raise Exception('Invalid door shuffle setting: %s' % world.doorShuffle[player])
 
     if world.doorShuffle[player] != 'vanilla':
         create_door_spoiler(world, player)
diff --git a/Mystery.py b/Mystery.py
index 7bc43f37..9937b5ad 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -3,6 +3,7 @@ import logging
 import random
 import urllib.request
 import urllib.parse
+import re
 
 from DungeonRandomizer import parse_arguments
 from Main import main as DRMain
@@ -14,6 +15,7 @@ def parse_yaml(txt):
     ret = {}
     indents = {len(txt) - len(txt.lstrip(' ')): ret}
     for line in txt.splitlines():
+        line = re.sub(r'#.*', '', line)
         if not line:
             continue
         name, val = line.split(':', 1)