--- a/waypoint.c	Sun Sep 09 20:52:54 2007 +0000
+++ b/waypoint.c	Sun Sep 09 22:35:21 2007 +0000
@@ -319,7 +319,7 @@
 	wp = GetWaypoint(p1);
 	if (!CheckTileOwnership(wp->xy)) return CMD_ERROR;
 
-	if (_cmd_text[0] != '\0') {
+	if (_cmd_text != NULL && _cmd_text[0] != '\0') {
 		StringID str = AllocateNameUnique(_cmd_text, 0);
 
 		if (str == 0) return CMD_ERROR;