diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp
index b56d45ff..3c003f01 100644
--- a/Editor/EditorMercs.cpp
+++ b/Editor/EditorMercs.cpp
@@ -1657,7 +1657,7 @@ void IndicateSelectedMerc( INT16 sID )
 		}
 	}
 	//if we made it this far, then we have a new merc cursor indicator to draw.
-	if( gpSelected->pSoldier )
+	if( gpSelected == NULL || gpSelected->pSoldier )
 		gsSelectedMercGridNo = gpSelected->pSoldier->sGridNo;
 	else
 	{