diff --git a/src/MissionManager/MissionCommandTree.cc b/src/MissionManager/MissionCommandTree.cc
index 06f8c5e040d8954e97b89dba1ff04cacde637979..2c6e4fed84283c50cffa4d7e760bd528d853eb3a 100644
--- a/src/MissionManager/MissionCommandTree.cc
+++ b/src/MissionManager/MissionCommandTree.cc
@@ -174,7 +174,11 @@ QString MissionCommandTree::friendlyName(MAV_CMD command)
     MissionCommandList *    commandList =   _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GENERIC];
     MissionCommandUIInfo*   uiInfo =        commandList->getUIInfo(command);
 
-    return uiInfo->friendlyName();
+    if (uiInfo) {
+        return uiInfo->friendlyName();
+    } else {
+        return QString("MAV_CMD(%1)").arg((int)command);
+    }
 }
 
 QString MissionCommandTree::rawName(MAV_CMD command)
@@ -182,7 +186,11 @@ QString MissionCommandTree::rawName(MAV_CMD command)
     MissionCommandList *    commandList =   _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GENERIC];
     MissionCommandUIInfo*   uiInfo =        commandList->getUIInfo(command);
 
-    return uiInfo->rawName();
+    if (uiInfo) {
+        return uiInfo->rawName();
+    } else {
+        return QString("MAV_CMD(%1)").arg((int)command);
+    }
 }
 
 const QList<MAV_CMD>& MissionCommandTree::allCommandIds(void) const