diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc
index a00922c77558e2f36e9f6178e29f628dd8743fbf..4bece5b09737b8ef8ad9382c4a22d9f532f4fc40 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
@@ -363,12 +363,12 @@ void FirmwareUpgradeController::_downloadFinished(void)
     
     // We can't proceed unless we have the bootloader
     if (!_bootloaderFound) {
-        _errorCancel(QString("Bootloader not found").arg(_imageSize).arg(_bootloaderBoardFlashSize));
+        _errorCancel("Bootloader not found");
         return;
     }
     
-    if (_bootloaderBoardFlashSize != 0 && _imageSize > _bootloaderBoardFlashSize) {
-        _errorCancel(QString("Image size of %1 is too large for board flash size %2").arg(_imageSize).arg(_bootloaderBoardFlashSize));
+    if (_bootloaderBoardFlashSize != 0 && image->imageSize() > _bootloaderBoardFlashSize) {
+        _errorCancel(QString("Image size of %1 is too large for board flash size %2").arg(image->imageSize()).arg(_bootloaderBoardFlashSize));
         return;
     }
 
diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h
index 6065ddafb8f35aed096ba53a810b7fc4695419f8..b9c4dcde203bc9c6e2ee8de0ed0599b7a33894a6 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.h
+++ b/src/VehicleSetup/FirmwareUpgradeController.h
@@ -154,8 +154,6 @@ private:
     
     bool            _startFlashWhenBootloaderFound;
     FirmwareType_t  _startFlashWhenBootloaderFoundFirmwareType;
-    
-    uint32_t    _imageSize;         ///< Image size of firmware being flashed
 
     QPixmap _boardIcon;             ///< Icon used to display image of board