--- a/engine.c	Tue May 17 20:54:05 2005 +0000
+++ b/engine.c	Tue May 17 20:58:58 2005 +0000
@@ -887,7 +887,7 @@
 {
 	StringID str;
 
-	if (!IsEngineIndex(p1)) return CMD_ERROR;
+	if (!IsEngineIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	str = AllocateNameUnique(_cmd_text, 0);
 	if (str == 0) return CMD_ERROR;

--- a/misc_cmd.c	Tue May 17 20:54:05 2005 +0000
+++ b/misc_cmd.c	Tue May 17 20:58:58 2005 +0000
@@ -129,6 +129,8 @@
 	StringID str;
 	Player *p;
 
+	if (_cmd_text[0] == '\0') return CMD_ERROR;
+
 	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
 
@@ -153,6 +155,8 @@
 	StringID str;
 	Player *p;
 
+	if (_cmd_text[0] == '\0') return CMD_ERROR;
+
 	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
 

--- a/station_cmd.c	Tue May 17 20:54:05 2005 +0000
+++ b/station_cmd.c	Tue May 17 20:58:58 2005 +0000
@@ -2653,7 +2653,7 @@
 	StringID str,old_str;
 	Station *st;
 
-	if (!IsStationIndex(p1)) return CMD_ERROR;
+	if (!IsStationIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 	st = GetStation(p1);
 
 	if (!IsValidStation(st) || !CheckOwnership(st->owner)) return CMD_ERROR;

--- a/town_cmd.c	Tue May 17 20:54:05 2005 +0000
+++ b/town_cmd.c	Tue May 17 20:58:58 2005 +0000
@@ -1447,7 +1447,7 @@
 	StringID str;
 	Town *t;
 
-	if (!IsTownIndex(p1)) return CMD_ERROR;
+	if (!IsTownIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	t = GetTown(p1);
 

--- a/vehicle.c	Tue May 17 20:54:05 2005 +0000
+++ b/vehicle.c	Tue May 17 20:58:58 2005 +0000
@@ -1654,7 +1654,7 @@
 	Vehicle *v;
 	StringID str;
 
-	if (!IsVehicleIndex(p1)) return CMD_ERROR;
+	if (!IsVehicleIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	v = GetVehicle(p1);