diff --git a/pom.xml b/pom.xml
index 388a7dad1..527849b53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.volmit</groupId>
 	<artifactId>Iris</artifactId>
-	<version>1.2.4-hotfix1</version>
+	<version>1.2.5</version>
 	<name>Iris</name>
 	<properties>
 		<skip.copy>false</skip.copy>
diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java
index b16bb4a6b..5256be73a 100644
--- a/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java
+++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java
@@ -28,7 +28,6 @@ public class CommandIrisStudioGoto extends MortarCommand
 		{
 			list.add(IrisWorlds.access(sender.player().getWorld()).getData().getBiomeLoader().getPossibleKeys());
 			list.add(IrisWorlds.access(sender.player().getWorld()).getData().getRegionLoader().getPossibleKeys());
-			list.add(IrisWorlds.access(sender.player().getWorld()).getData().getObjectLoader().getPossibleKeys());
 		}
 	}
 
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java
index f0f694bce..769434cbb 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java
@@ -246,6 +246,11 @@ public interface IrisAccess extends Hotloadable, DataProvider {
             }
         }
 
+        if(engines.isEmpty())
+        {
+            return null;
+        }
+
         AtomicInteger tries = new AtomicInteger(0);
         AtomicBoolean found = new AtomicBoolean(false);
         AtomicReference<Location> location = new AtomicReference<>();