From fdf19f902559967f8181115a680ca4741214ccd9 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 27 Aug 2014 01:27:17 -0400
Subject: [PATCH] closes #2022

---
 public/src/modules/settings.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js
index 29bc4a4c4e..78ac0ad044 100644
--- a/public/src/modules/settings.js
+++ b/public/src/modules/settings.js
@@ -448,17 +448,18 @@ define('settings', function () {
 			helper.persistSettings(hash, Settings.cfg, notify, callback);
 		},
 		load: function (hash, formEl, callback) {
+			callback = callback || function() {};
 			socket.emit('admin.settings.get', {
 				hash: hash
 			}, function (err, values) {
-				if (!err) {
-					$(formEl).deserialize(values);
-					if (typeof callback === 'function') {
-						callback();
-					}
-				} else {
+				if (err) {
 					console.log('[settings] Unable to load settings for hash: ', hash);
+					return callback(err);
 				}
+
+				$(formEl).deserialize(values);
+
+				callback(null, values);
 			});
 		},
 		save: function (hash, formEl, callback) {