diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js
index 9c25c3c26..422be070f 100644
--- a/src/js/services/onGoingProcess.js
+++ b/src/js/services/onGoingProcess.js
@@ -74,10 +74,8 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
     root.onGoingProcessName = name;
 
     var showName = $filter('translate')(processNames[name] || name);
-
-    if (customHandler) {
-      customHandler(processName, showName, isOn);
-    } else if (root.onGoingProcessName) {
+    
+    if (root.onGoingProcessName) {
       var tmpl;
       if (isWindowsPhoneApp) tmpl = '<div>' + showName + '</div>';
       else tmpl = '<div class="item-icon-left">' + showName + '<ion-spinner class="spinner-stable" icon="lines"></ion-spinner></div>';
@@ -87,6 +85,10 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
     } else {
       $ionicLoading.hide();
     }
+
+    if (customHandler) {
+      customHandler(processName, showName, isOn);
+    } 
   };
 
   return root;
diff --git a/src/js/services/shapeshift.service.js b/src/js/services/shapeshift.service.js
index 77f0de297..73410e478 100644
--- a/src/js/services/shapeshift.service.js
+++ b/src/js/services/shapeshift.service.js
@@ -57,7 +57,7 @@ angular
     function shiftIt(coinIn, coinOut, withdrawalAddress, returnAddress, amount, cb) {
       // Test if the amount is correct depending on the min and max
       if (!amount || typeof amount !== 'number') {
-        cb(new Error(gettextCatalog.getString('Amount is not defined'))));
+        cb(new Error(gettextCatalog.getString('Amount is not defined')));
       } else if (amount < service.marketData.minimum) {
         cb(new Error(gettextCatalog.getString('Amount is below the minimun')));
       } else if (amount > service.marketData.maxLimit) {