diff --git a/src/ui/QGCConfigView.cc b/src/ui/QGCConfigView.cc
index 16147f3e4b91ca8ec28b1e69a30c0c7a1cd24f75..f2167b63027f20323beb7c0457ed60c3f6464183 100644
--- a/src/ui/QGCConfigView.cc
+++ b/src/ui/QGCConfigView.cc
@@ -95,9 +95,11 @@ void QGCConfigView::activeUASChanged(UASInterface* uas)
         }
     }
     else {
-        //restore waiting label if we no longer have a connection
-        ui->gridLayout->addWidget(ui->waitingLabel);
-        ui->waitingLabel->setVisible(true);
+        if (ui->waitingLabel) {
+            //restore waiting label if we no longer have a connection
+            ui->gridLayout->addWidget(ui->waitingLabel);
+            ui->waitingLabel->setVisible(true);
+        }
     }
 
 }