diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
index 25adf3d5..9e43752f 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
@@ -795,11 +795,12 @@ public class RoomManager
 
         if (!habbo.getRoomUnit().isTeleporting)
         {
-            habbo.getRoomUnit().setLocation(room.getLayout().getTile(room.getLayout().getDoorX(), room.getLayout().getDoorY()));
+
             RoomTile doorTile = room.getLayout().getTile(room.getLayout().getDoorX(), room.getLayout().getDoorY());
 
             if (doorTile != null)
             {
+                habbo.getRoomUnit().setLocation(doorTile);
                 habbo.getRoomUnit().setZ(doorTile.getStackHeight());
             }