diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc
index 619a34b75da3cc35f3ffed743e5ac46346063278..d48af88e498e9917abcf5b00ac5ed29d393b8236 100644
--- a/src/VehicleSetup/SetupView.cc
+++ b/src/VehicleSetup/SetupView.cc
@@ -120,7 +120,7 @@ void SetupView::_setConnectedView(void)
 
 void SetupView::_firmwareButtonClicked(void)
 {
-    if (_uasCurrent->isArmed()) {
+    if (_uasCurrent && _uasCurrent->isArmed()) {
         QGCMessageBox::warning("Setup", "Firmware Update cannot be performed while vehicle is armed.");
         return;
     }