diff --git a/src/js/controllers/shapeshift.js b/src/js/controllers/shapeshift.js
index 0dac21a11..652f54c34 100644
--- a/src/js/controllers/shapeshift.js
+++ b/src/js/controllers/shapeshift.js
@@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
     walletsBtc = profileService.getWallets({coin: 'btc'});
     walletsBch = profileService.getWallets({coin: 'bch'});
     $scope.fromWallets = lodash.filter(walletsBtc.concat(walletsBch), function(w) {
-      return w.status.balance.availableAmount > 0;
+      return (w.status && w.status.balance && w.status.balance.availableAmount > 0);
     });
 
     $scope.singleFromWallet = $scope.fromWallets.length === 1;
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;