diff --git a/umap/static/umap/js/umap.core.js b/umap/static/umap/js/umap.core.js
index 7fcb521b..2d926143 100644
--- a/umap/static/umap/js/umap.core.js
+++ b/umap/static/umap/js/umap.core.js
@@ -121,7 +121,7 @@ L.Util.detectFileType = function (f) {
 };
 
 L.Util.usableOption = function (options, option) {
-    return typeof options[option] !== 'undefined' && options[option] !== '' && options[option] !== null;
+    return typeof options[option] !== 'undefined' && options[option] !== '';
 };
 
 L.Util.greedyTemplate = function (str, data, ignore) {
diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js
index abb43c41..394a04b9 100644
--- a/umap/static/umap/js/umap.js
+++ b/umap/static/umap/js/umap.js
@@ -545,7 +545,7 @@ L.U.Map.include({
 
     getOption: function (option) {
         if (L.Util.usableOption(this.options, option)) return this.options[option];
-        else return this.getDefaultOption(option);
+        return this.getDefaultOption(option);
     },
 
     updateExtent: function() {