diff --git a/lnwire/message.go b/lnwire/message.go
index bd9244969..a10bba29a 100644
--- a/lnwire/message.go
+++ b/lnwire/message.go
@@ -192,7 +192,7 @@ func makeEmptyMessage(msgType MessageType) (Message, error) {
 	case MsgPong:
 		msg = &Pong{}
 	default:
-		return nil, fmt.Errorf("unknown message type [%d]", msgType)
+		return nil, &UnknownMessage{msgType}
 	}
 
 	return msg, nil