diff --git a/src/modules/modal.js b/src/modules/modal.js
index 34d1862fa..2a88dd76f 100755
--- a/src/modules/modal.js
+++ b/src/modules/modal.js
@@ -146,12 +146,18 @@ $.fn.modal = function(parameters) {
             module.verbose('Closing element pressed');
             if( $(this).is(selector.approve) ) {
               if($.proxy(settings.onApprove, element)()) {
-                modal.hide();
+                module.hide();
+              }
+              else {
+                module.verbose('Approve callback returned false cancelling hide');
               }
             }
             if( $(this).is(selector.deny) ) {
               if($.proxy(settings.onDeny, element)()) {
-                modal.hide();
+                module.hide();
+              }
+              else {
+                module.verbose('Deny callback returned false cancelling hide');
               }
             }
             else {
@@ -387,26 +393,22 @@ $.fn.modal = function(parameters) {
         },
 
         setting: function(name, value) {
-          if(value !== undefined) {
-            if( $.isPlainObject(name) ) {
-              $.extend(true, settings, name);
-            }
-            else {
-              settings[name] = value;
-            }
+          if( $.isPlainObject(name) ) {
+            $.extend(true, settings, name);
+          }
+          else if(value !== undefined) {
+            settings[name] = value;
           }
           else {
             return settings[name];
           }
         },
         internal: function(name, value) {
-          if(value !== undefined) {
-            if( $.isPlainObject(name) ) {
-              $.extend(true, module, name);
-            }
-            else {
-              module[name] = value;
-            }
+          if( $.isPlainObject(name) ) {
+            $.extend(true, module, name);
+          }
+          else if(value !== undefined) {
+            module[name] = value;
           }
           else {
             return module[name];
@@ -591,8 +593,8 @@ $.fn.modal.settings = {
     deny     : '.actions .negative, .actions .cancel'
   },
   error : {
-    dimmer : 'UI Dimmer, a required component is not included in this page',
-    method : 'The method you called is not defined.'
+    dimmer    : 'UI Dimmer, a required component is not included in this page',
+    method    : 'The method you called is not defined.'
   },
   className : {
     active    : 'active',