diff --git a/src/js/services/addressService.js b/src/js/services/addressService.js
index 69884ecde..0dd4a20d0 100644
--- a/src/js/services/addressService.js
+++ b/src/js/services/addressService.js
@@ -35,8 +35,8 @@ angular.module('copayApp.services')
               root._createAddress(walletId, cb);
             }, 5000);
           } else if (err.code && err.code == 'MAIN_ADDRESS_GAP_REACHED') {
-            prefix = gettextCatalog.getString('Limit of address generation reached');
             $log.warn(err.message);
+            prefix = null;
             client.getMainAddresses({reverse: true, limit : 1}, function(err, addr) {
               if (err) return cb(err);
               return cb(null, addr[0].address);
diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index b6055925c..4c26cef90 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -94,7 +94,7 @@ angular.module('copayApp.services')
             body = gettextCatalog.getString('Wallet seed is invalid');
             break;
           case 'MAIN_ADDRESS_GAP_REACHED':
-            body = gettextCatalog.getString('You cannot generate more until you register any activity');
+            body = gettextCatalog.getString('Empty addresses limit reached. New addresses cannot be generated.');
             break;
   
           case 'ERROR':
@@ -112,7 +112,7 @@ angular.module('copayApp.services')
         body = gettextCatalog.getString(err);
       }
 
-      var msg = prefix + ( body ? ': ' + body  : '');
+      var msg = prefix + ( body ? (prefix ? ': ' : '') + body  : '');
       return msg;
     };