diff --git a/src/index.js b/src/index.js
index 4011d96140..d560fff5d1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -171,10 +171,13 @@ class PubsubBaseProtocol extends EventEmitter {
     this.log('connected', idB58Str)
 
     const peer = this._addPeer(new Peer(peerInfo))
-    const { stream } = await conn.newStream(this.multicodecs)
-
-    peer.attachConnection(stream)
-    this._processMessages(idB58Str, stream, peer)
+    try {
+      const { stream } = await conn.newStream(this.multicodecs)
+      peer.attachConnection(stream)
+      this._processMessages(idB58Str, stream, peer)
+    } catch (err) {
+      this.log.err(err)
+    }
   }
 
   /**
@@ -220,6 +223,7 @@ class PubsubBaseProtocol extends EventEmitter {
    * @returns {PeerInfo}
    */
   _removePeer (peer) {
+    if (!peer) return
     const id = peer.info.id.toB58String()
 
     this.log('remove', id, peer._references)
diff --git a/test/pubsub.spec.js b/test/pubsub.spec.js
index 25bc55b5bb..2b989e8242 100644
--- a/test/pubsub.spec.js
+++ b/test/pubsub.spec.js
@@ -189,6 +189,27 @@ describe('pubsub base protocol', () => {
       expect(pubsubB.peers.size).to.be.eql(1)
     })
 
+    it('should handle newStream errors in onConnect', async () => {
+      const onConnectA = registrarRecordA[protocol].onConnect
+      const handlerB = registrarRecordB[protocol].handler
+
+      // Notice peers of connection
+      const [c0, c1] = ConnectionPair()
+      const error = new Error('new stream error')
+      sinon.stub(c0, 'newStream').throws(error)
+
+      await onConnectA(peerInfoB, c0)
+      await handlerB({
+        protocol,
+        stream: c1.stream,
+        connection: {
+          remotePeer: peerInfoA.id
+        }
+      })
+
+      expect(c0.newStream).to.have.property('callCount', 1)
+    })
+
     it('should handle onDisconnect as expected', async () => {
       const onConnectA = registrarRecordA[protocol].onConnect
       const onDisconnectA = registrarRecordA[protocol].onDisconnect
@@ -214,6 +235,17 @@ describe('pubsub base protocol', () => {
       expect(pubsubA.peers.size).to.be.eql(0)
       expect(pubsubB.peers.size).to.be.eql(0)
     })
+
+    it('should handle onDisconnect for unknown peers', () => {
+      const onDisconnectA = registrarRecordA[protocol].onDisconnect
+
+      expect(pubsubA.peers.size).to.be.eql(0)
+
+      // Notice peers of disconnect
+      onDisconnectA(peerInfoB)
+
+      expect(pubsubA.peers.size).to.be.eql(0)
+    })
   })
 
   describe('getSubscribers', () => {