diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
index c7a5dcd87..c2a796857 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
@@ -52,6 +52,10 @@ public class Commandhome extends EssentialsCommand
 					user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
 					throw new NoChargeException();
 				}
+				else
+				{
+					throw new Exception(_("bedmissing"));
+				}
 			}
 			goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge);
 		}
@@ -73,9 +77,16 @@ public class Commandhome extends EssentialsCommand
 			}
 			else
 			{
-				if (bed != null  && user.isAuthorized("essentials.home.bed"))
+				if (user.isAuthorized("essentials.home.bed"))
 				{
-					homes.add(_("bed"));
+					if (bed != null)
+					{
+						homes.add(_("bed"));
+					}
+					else
+					{
+						homes.add(_("bednull"));
+					}
 				}
 				user.sendMessage(_("homes", Util.joinList(homes)));
 			}