diff --git a/src/micropolisj/engine/Micropolis.java b/src/micropolisj/engine/Micropolis.java
index 1117265..8140a81 100644
--- a/src/micropolisj/engine/Micropolis.java
+++ b/src/micropolisj/engine/Micropolis.java
@@ -431,7 +431,7 @@ public class Micropolis
 		}
 	}
 
-	final boolean testBounds(int xpos, int ypos)
+	final public boolean testBounds(int xpos, int ypos)
 	{
 		return xpos >= 0 && xpos < getWidth() &&
 			ypos >= 0 && ypos < getHeight();
diff --git a/src/micropolisj/gui/MainWindow.java b/src/micropolisj/gui/MainWindow.java
index 4d74d34..93ba7b2 100644
--- a/src/micropolisj/gui/MainWindow.java
+++ b/src/micropolisj/gui/MainWindow.java
@@ -898,6 +898,9 @@ public class MainWindow extends JFrame
 
 	void doQueryTool(int xpos, int ypos)
 	{
+		if (!engine.testBounds(xpos, ypos))
+			return;
+
 		ZoneStatus z = engine.queryZoneStatus(xpos, ypos);
 		notificationPane.showZoneStatus(engine, xpos, ypos, z);
 	}