diff --git a/deluge/ui/web/js/Deluge.MultiOptionsManager.js b/deluge/ui/web/js/Deluge.MultiOptionsManager.js
index 043a739e5..dd43f0d6b 100644
--- a/deluge/ui/web/js/Deluge.MultiOptionsManager.js
+++ b/deluge/ui/web/js/Deluge.MultiOptionsManager.js
@@ -146,7 +146,9 @@ Deluge.MultiOptionsManager = Ext.extend(Deluge.OptionsManager, {
 	 * @param {Object} value The value for the option
 	 */
 	setDefault: function(option, value) {
-		if (value === undefined) {
+		if (option === undefined) {
+			return;
+		} else if (value === undefined) {
 			for (var key in option) {
 				this.setDefault(key, option[key]);
 			}
@@ -175,7 +177,9 @@ Deluge.MultiOptionsManager = Ext.extend(Deluge.OptionsManager, {
 	 * @param {Object} [value];
 	 */
 	update: function(option, value) {
-		if (value === undefined) {
+		if (option === undefined) {
+			return;
+		} else if (value === undefined) {
 			for (var key in option) {
 				this.update(key, option[key]);
 			}
diff --git a/deluge/ui/web/js/Deluge.OptionsManager.js b/deluge/ui/web/js/Deluge.OptionsManager.js
index 33f95fb01..52c13ffc9 100644
--- a/deluge/ui/web/js/Deluge.OptionsManager.js
+++ b/deluge/ui/web/js/Deluge.OptionsManager.js
@@ -189,7 +189,9 @@ Deluge.OptionsManager = Ext.extend(Ext.util.Observable, {
 	 * @param {Object} value The value for the option
 	 */
 	set: function(option, value) {
-		if (typeof option == 'object') {
+		if (option === undefined) {
+			return;
+		} else if (typeof option == 'object') {
 			var options = option;
 			this.options = Ext.apply(this.options, options);
 			for (var option in options) {
@@ -207,7 +209,9 @@ Deluge.OptionsManager = Ext.extend(Ext.util.Observable, {
 	 * @param {Object} [value];
 	 */
 	update: function(option, value) {
-		if (value === undefined) {
+		if (option === undefined) {
+			return;
+		} else if (value === undefined) {
 			for (var key in option) {
 				this.update(key, option[key]);
 			}