diff --git a/plugins/isoworld b/plugins/isoworld
index 6a74e3ee9..510ca8aaa 160000
--- a/plugins/isoworld
+++ b/plugins/isoworld
@@ -1 +1 @@
-Subproject commit 6a74e3ee9ee9d3e35da746fd3fd1d99c30b2e5ad
+Subproject commit 510ca8aaaa6f6da51fbd00b51a2facd61dae07f1
diff --git a/plugins/isoworldremote.cpp b/plugins/isoworldremote.cpp
index a57c6c633..6a86d96bc 100644
--- a/plugins/isoworldremote.cpp
+++ b/plugins/isoworldremote.cpp
@@ -177,6 +177,14 @@ static command_result GetEmbarkTile(color_ostream &stream, const TileRequest *in
 
 static command_result GetEmbarkInfo(color_ostream &stream, const MapRequest *in, MapReply *out)
 {
+    if(!Core::getInstance().isWorldLoaded()) {
+        out->set_available(false);
+        return CR_OK;
+    }
+    if(!Core::getInstance().isMapLoaded()) {
+        out->set_available(false);
+        return CR_OK;
+    }
     if(!df::global::gamemode) {
         out->set_available(false);
         return CR_OK;