diff --git a/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
index 0be6ef1..dce3236 100644
--- a/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
+++ b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
@@ -113,7 +113,6 @@ public class WarpSignsListener implements Listener {
             return;
         }
         User user = User.getInstance(e.getPlayer());
-        if (user == null) return;
         UUID owner = addon.getWarpSignsManager().getWarpOwnerUUID(b.getLocation()).orElse(null);
         if (isPlayersSign(e.getPlayer(), b, inWorld)) {
             addon.getWarpSignsManager().removeWarp(b.getLocation());
diff --git a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java
index fe00ca5..52e95bd 100644
--- a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java
+++ b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java
@@ -244,8 +244,8 @@ public class WarpSignsManager {
             if (en.getValue().equals(loc)) {
                 // Inform player
                 Optional.ofNullable(addon.getServer().getPlayer(en.getKey()))
-                        .map(User::getInstance)
-                        .ifPresent(user -> user.sendMessage("warps.sign-removed"));
+                .map(User::getInstance)
+                .ifPresent(user -> user.sendMessage("warps.sign-removed"));
                 // Remove sign from warp panel cache
                 addon.getSignCacheManager().removeWarp(loc.getWorld(), en.getKey());
                 it.remove();
@@ -319,8 +319,8 @@ public class WarpSignsManager {
         if (!prefix.isEmpty())
         {
             icon = Material.matchMaterial(
-                Utils.getPermissionValue(User.getInstance(uuid), prefix + "island.warp",
-                    Material.OAK_SIGN.name()));
+                    Utils.getPermissionValue(User.getInstance(uuid), prefix + "island.warp",
+                            Material.OAK_SIGN.name()));
         }
         else
         {
@@ -355,7 +355,7 @@ public class WarpSignsManager {
         //we prevent issues where no one teleported, but people still
         //get messages about it.
         Util.teleportAsync(user.getPlayer(), actualWarp, TeleportCause.COMMAND).thenAccept(tpResult -> {
-            if(!tpResult) return;
+            if(Boolean.FALSE.equals(tpResult)) return;
 
             User warpOwner = Objects.requireNonNull(User.getInstance(signOwner));
             // Hide invisible players