diff --git a/.travis.yml b/.travis.yml
index 9ee9329f..1050422b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ script:
   - grunt test
   - grunt docs
   - grunt node
-  - grunt prod --msg="$COMPILE_MSG"
+  - grunt prod --msg=$COMPILE_MSG
 before_deploy:
   - grunt copy:ghPages
 deploy:
diff --git a/src/web/OptionsWaiter.js b/src/web/OptionsWaiter.js
index ea722739..02e44c0c 100755
--- a/src/web/OptionsWaiter.js
+++ b/src/web/OptionsWaiter.js
@@ -43,8 +43,11 @@ OptionsWaiter.prototype.load = function(options) {
 
     const selects = document.querySelectorAll("#options-body select");
     for (i = 0; i < selects.length; i++) {
-        selects[i].value = this.app.options[selects[i].getAttribute("option")];
-        selects[i].dispatchEvent(new CustomEvent("change", {bubbles: true}));
+        const val = this.app.options[selects[i].getAttribute("option")];
+        if (val) {
+            selects[i].value = val;
+            selects[i].dispatchEvent(new CustomEvent("change", {bubbles: true}));
+        }
     }
 };