diff --git a/channeldb/graph.go b/channeldb/graph.go
index 8f56d8ee9..63f04befd 100644
--- a/channeldb/graph.go
+++ b/channeldb/graph.go
@@ -2860,7 +2860,10 @@ func deserializeLightningNode(r io.Reader) (LightningNode, error) {
 	node.ExtraOpaqueData, err = wire.ReadVarBytes(
 		r, 0, MaxAllowedExtraOpaqueBytes, "blob",
 	)
-	if err != nil && err != io.ErrUnexpectedEOF {
+	switch {
+	case err == io.ErrUnexpectedEOF:
+	case err == io.EOF:
+	case err != nil:
 		return LightningNode{}, err
 	}
 
@@ -3012,7 +3015,10 @@ func deserializeChanEdgeInfo(r io.Reader) (ChannelEdgeInfo, error) {
 	edgeInfo.ExtraOpaqueData, err = wire.ReadVarBytes(
 		r, 0, MaxAllowedExtraOpaqueBytes, "blob",
 	)
-	if err != nil && err != io.ErrUnexpectedEOF {
+	switch {
+	case err == io.ErrUnexpectedEOF:
+	case err == io.EOF:
+	case err != nil:
 		return ChannelEdgeInfo{}, err
 	}
 
@@ -3260,7 +3266,10 @@ func deserializeChanEdgePolicy(r io.Reader,
 	edge.ExtraOpaqueData, err = wire.ReadVarBytes(
 		r, 0, MaxAllowedExtraOpaqueBytes, "blob",
 	)
-	if err != nil && err != io.ErrUnexpectedEOF {
+	switch {
+	case err == io.ErrUnexpectedEOF:
+	case err == io.EOF:
+	case err != nil:
 		return nil, err
 	}