diff --git a/src/ui/QGCVehicleConfig.cc b/src/ui/QGCVehicleConfig.cc
index 3bf81307046ea9108eb9c0926d689a3f2254e9d9..348dab33fdc5ec2a7e7ba8c1f3ba728819f559d1 100644
--- a/src/ui/QGCVehicleConfig.cc
+++ b/src/ui/QGCVehicleConfig.cc
@@ -39,6 +39,7 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
     systemTypeToParamMap["FIXED_WING"] = new QMap<QString,QGCToolWidget*>();
     systemTypeToParamMap["QUADROTOR"] = new QMap<QString,QGCToolWidget*>();
     systemTypeToParamMap["GROUND_ROVER"] = new QMap<QString,QGCToolWidget*>();
+    systemTypeToParamMap["BOAT"] = new QMap<QString,QGCToolWidget*>();
     libParamToWidgetMap = new QMap<QString,QGCToolWidget*>();
 
     setObjectName("QGC_VEHICLECONFIG");
@@ -726,6 +727,8 @@ void QGCVehicleConfig::setActiveUAS(UASInterface* active)
     {
         //Indication that we have no meta data for this system type.
         qDebug() << "No parameters defined for system type:" << mav->getSystemTypeName();
+        systemTypeToParamMap[mav->getSystemTypeName()] = new QMap<QString,QGCToolWidget*>();
+        paramToWidgetMap = systemTypeToParamMap[mav->getSystemTypeName()];
     }
 
     if (!paramTooltips.isEmpty())