diff --git a/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java b/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java
index 3d052b3..0383c9b 100644
--- a/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java
+++ b/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java
@@ -220,7 +220,7 @@ public class Greenhouse implements DataObject {
      * @return true if inside the greenhouse
      */
     public boolean contains(Location location2) {
-        return getLocation().getWorld() != null
+        return getLocation() != null && getLocation().getWorld() != null
                 && getLocation().getWorld().equals(location2.getWorld())
                 && getBoundingBox().contains(location2.toVector());
     }
diff --git a/src/main/java/world/bentobox/greenhouses/ui/panel/PanelClick.java b/src/main/java/world/bentobox/greenhouses/ui/panel/PanelClick.java
index 31479d9..2935861 100644
--- a/src/main/java/world/bentobox/greenhouses/ui/panel/PanelClick.java
+++ b/src/main/java/world/bentobox/greenhouses/ui/panel/PanelClick.java
@@ -43,10 +43,6 @@ public class PanelClick implements ClickHandler {
     }
 
     private boolean makeGreenhouse(User user, BiomeRecipe br) {
-        if (user.getLocation() == null) {
-            addon.logError("User has no location : " + user.getName());
-            return false;
-        }
         // Check flag
         if (!addon.getIslands().getIslandAt(user.getLocation()).map(i -> i.isAllowed(user, Greenhouses.GREENHOUSES)).orElse(false)) {
             user.sendMessage("greenhouses.errors.no-rank");
diff --git a/src/main/java/world/bentobox/greenhouses/ui/user/MakeCommand.java b/src/main/java/world/bentobox/greenhouses/ui/user/MakeCommand.java
index 0111e2e..6b7a893 100644
--- a/src/main/java/world/bentobox/greenhouses/ui/user/MakeCommand.java
+++ b/src/main/java/world/bentobox/greenhouses/ui/user/MakeCommand.java
@@ -92,10 +92,6 @@ class MakeCommand extends CompositeCommand  {
      * @return true if successful
      */
     private boolean makeGreenhouse(User user, BiomeRecipe br) {
-        if (user.getLocation() == null) {
-            getAddon().logError("User had no location");
-            return false;
-        }
         // Check flag
         if (!getIslands().getIslandAt(user.getLocation()).map(i -> i.isAllowed(user, Greenhouses.GREENHOUSES)).orElse(false)) {
             user.sendMessage("greenhouses.errors.no-rank");
diff --git a/src/main/java/world/bentobox/greenhouses/ui/user/RemoveCommand.java b/src/main/java/world/bentobox/greenhouses/ui/user/RemoveCommand.java
index 8ae6a8f..49ca538 100644
--- a/src/main/java/world/bentobox/greenhouses/ui/user/RemoveCommand.java
+++ b/src/main/java/world/bentobox/greenhouses/ui/user/RemoveCommand.java
@@ -35,10 +35,6 @@ class RemoveCommand extends CompositeCommand {
      */
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        if (user.getLocation() == null) {
-            getAddon().logError("User had no location");
-            return false;
-        }
         // Check flag
         if (!getIslands().getIslandAt(user.getLocation()).map(i -> i.isAllowed(user, Greenhouses.GREENHOUSES)).orElse(false)) {
             user.sendMessage("greenhouses.errors.no-rank");