diff --git a/src/main/java/com/eu/habbo/threading/runnables/RemoveFloorItemTask.java b/src/main/java/com/eu/habbo/threading/runnables/RemoveFloorItemTask.java
index da912d5d..9fc3f109 100644
--- a/src/main/java/com/eu/habbo/threading/runnables/RemoveFloorItemTask.java
+++ b/src/main/java/com/eu/habbo/threading/runnables/RemoveFloorItemTask.java
@@ -20,6 +20,9 @@ class RemoveFloorItemTask implements Runnable
     @Override
     public void run()
     {
+        if(this.item == null || this.room == null)
+            return;
+
         RoomTile tile = this.room.getLayout().getTile(this.item.getX(), this.item.getY());
         this.room.removeHabboItem(this.item);
         this.room.updateTile(tile);