diff --git a/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java b/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java
index e32b804..9a25173 100644
--- a/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java
+++ b/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java
@@ -140,7 +140,9 @@ public class CellCreationSteps {
 		
 		c.addAllSigns(cp.getSigns());
 		c.setTeleport(cp.getTeleportInSL());
-		c.setChestLocation(cp.getChestLocation());
+		
+		if(cp.getChestLocation() != null)
+			c.setChestLocation(cp.getChestLocation());
 		
 		j.addCell(c, true);