diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index 94dc87b6b..baeabcda8 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -174,13 +174,15 @@ Network.prototype._onData = function(encStr, isInbound, peerId) {
   console.log('### RECEIVED INBOUND?:%s TYPE: %s FROM %s', 
               isInbound, payload.type, peerId, payload); 
 
-  if(payload.type === 'hello' &&  !this.authenticatedPeers[peerId]) {
-    var payloadStr = JSON.stringify(payload);
-    if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) {
-      console.log('#### Peer is not on the allowedCopayerIds. Closing connection', 
-                  this.allowedCopayerIds, payload.copayerId);
-      this._deletePeer(peerId);
-      return;
+  if(payload.type === 'hello' ) {
+    if (!this.authenticatedPeers[peerId]) {
+      var payloadStr = JSON.stringify(payload);
+      if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) {
+        console.log('#### Peer is not on the allowedCopayerIds. Closing connection', 
+                    this.allowedCopayerIds, payload.copayerId);
+        this._deletePeer(peerId);
+        return;
+      }
     }
     console.log('#### Peer sent hello. Setting it up.'); //TODO
     this._setPeerAuthenticated(peerId);
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 2690e2cbc..c2d47f2ac 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -88,6 +88,7 @@ angular.module('copay.controllerUtils')
 
     root.setSocketHandlers = function() {
       Socket.removeAllListeners();
+      if (!$rootScope.wallet) return;
 
       var addrs = $rootScope.wallet.getAddressesStr();
       for (var i = 0; i < addrs.length; i++) {