diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
index e0aa77b9..a8c0e831 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java
@@ -761,6 +761,8 @@ public class RoomUnit {
     }
 
     public RoomTile getClosestAdjacentTile(short x, short y, boolean diagonal) {
+        if(room == null) return null;
+
         RoomTile baseTile = room.getLayout().getTile(x, y);
 
         if (baseTile == null) return null;