diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml
index 799d700..3c40896 100644
--- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml
+++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml
@@ -126,9 +126,10 @@ QGCView {
             QGCLabel {
                 id:             helpText
                 width:          parent.width - applyButton.width - 5
-                text:           "You've connected a " +
-                                controller.currentVehicleName +
-                                ". If you’d like to change this configuration, select the desired airframe below then click “Apply and Restart”."
+                text:           (controller.currentVehicleName != "" ?
+                                    "You've connected a " + controller.currentVehicleName :
+                                     "Airframe is not set") +
+                                ". To change this configuration, select the desired airframe below then click “Apply and Restart”."
                 font.weight:    Font.DemiBold
                 wrapMode:       Text.WordWrap
             }