diff --git a/app/controllers/resources/room.php b/app/controllers/resources/room.php
index 01af12eda85b7545bf27ab2e9e4a7a77a9f11bd9..1e710e8310cefd335c8509b3e23da2619aff77d2 100644
--- a/app/controllers/resources/room.php
+++ b/app/controllers/resources/room.php
@@ -164,7 +164,12 @@ class Resources_RoomController extends AuthenticatedController
         $this->grouped_properties = $this->room->getGroupedProperties(
             $this->room->getRequiredPropertyNames()
         );
-        $this->geo_coordinates_object = $this->room->building->getPropertyObject('geo_coordinates');
+
+        if ($this->room->building) {
+            $this->geo_coordinates_object = $this->room->building->getPropertyObject('geo_coordinates');
+        } else {
+            $this->geo_coordinates_object = null;
+        }
     }