diff --git a/lnwire/lnwire.go b/lnwire/lnwire.go
index 6fd28538c..e83e218b4 100644
--- a/lnwire/lnwire.go
+++ b/lnwire/lnwire.go
@@ -677,7 +677,7 @@ func readElement(r io.Reader, element interface{}) error {
 				continue
 
 			default:
-				return fmt.Errorf("unknown address type: %v", aType)
+				return ErrUnknownAddrType{aType}
 			}
 
 			addresses = append(addresses, address)
diff --git a/peer.go b/peer.go
index 695419703..bfb5cf8f3 100644
--- a/peer.go
+++ b/peer.go
@@ -761,6 +761,14 @@ out:
 				idleTimer.Reset(idleTimeout)
 				continue
 
+			// If they sent us an address type that we don't yet
+			// know of, then this isn't a dire error, so we'll
+			// simply continue parsing the remainder of their
+			// messages.
+			case *lnwire.ErrUnknownAddrType:
+				idleTimer.Reset(idleTimeout)
+				continue
+
 			// If the error we encountered wasn't just a message we
 			// didn't recognize, then we'll stop all processing s
 			// this is a fatal error.