diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
index 85c3d301..4ea4b282 100644
--- a/js/msp/MSPHelper.js
+++ b/js/msp/MSPHelper.js
@@ -2386,6 +2386,8 @@ var mspHelper = (function (gui) {
     self.loadLogicConditions = function (callback) {
         if (semver.gte(CONFIG.flightControllerVersion, "2.2.0")) {
             MSP.send_message(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS, false, false, callback);
+        } else {
+            callback();
         }
     }
 
diff --git a/js/settings.js b/js/settings.js
index a348c4d2..3414a6cf 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -78,6 +78,11 @@ var Settings = (function () {
         var settingName = input.data('setting');
         var setting = input.data('setting-info');
         var value;
+
+        if (typeof setting == 'undefined') {
+            return null;
+        }
+
         if (setting.table) {
             if (input.attr('type') == 'checkbox') {
                 value = input.prop('checked') ? 1 : 0;