diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar
index 50752bb..391da03 100644
Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ
diff --git a/src/sig/plugin/TwosideKeeper/DeathManager.java b/src/sig/plugin/TwosideKeeper/DeathManager.java
index eab9281..79846e5 100644
--- a/src/sig/plugin/TwosideKeeper/DeathManager.java
+++ b/src/sig/plugin/TwosideKeeper/DeathManager.java
@@ -43,7 +43,7 @@ public class DeathManager {
 				p.setVelocity(new Vector(0,0,0));
 				CustomDamage.removeIframe(p);
 				Location loc = p.getLocation();
-				loc.setY(p.getBedSpawnLocation().getY());
+				if (p.getBedSpawnLocation()!=null) {loc.setY(p.getBedSpawnLocation().getY());}
 				p.teleport(loc);
 			}},1);
 		PlayerStructure pd = PlayerStructure.GetPlayerStructure(p);