diff --git a/erynrl/map/generator/__init__.py b/erynrl/map/generator/__init__.py
index 9f3cd82..d82d44e 100644
--- a/erynrl/map/generator/__init__.py
+++ b/erynrl/map/generator/__init__.py
@@ -1,4 +1,6 @@
-from typing import List
+# Eryn Wells <eryn@erynwells.me>
+
+from typing import List, TYPE_CHECKING
 
 import numpy as np
 
@@ -6,6 +8,9 @@ from .corridor import CorridorGenerator
 from .room import RoomGenerator
 from ...geometry import Point
 
+if TYPE_CHECKING:
+    from .. import Map
+
 
 class MapGenerator:
     '''Abstract base class defining an interface for generating a map and applying it to a set of tiles.'''
diff --git a/erynrl/map/generator/room.py b/erynrl/map/generator/room.py
index 5a039b8..9a3423d 100644
--- a/erynrl/map/generator/room.py
+++ b/erynrl/map/generator/room.py
@@ -41,8 +41,10 @@ class RoomGenerator:
         '''Generate rooms and stairs'''
         did_generate_rooms = self._generate()
 
-        if did_generate_rooms:
-            self._generate_stairs()
+        if not did_generate_rooms:
+            return
+
+        self._generate_stairs()
 
     def _generate(self) -> bool:
         '''