diff --git a/lnwire/lnwire.go b/lnwire/lnwire.go
index 529e8782..1a9ea7f3 100644
--- a/lnwire/lnwire.go
+++ b/lnwire/lnwire.go
@@ -587,6 +587,9 @@ func readElement(r io.Reader, element interface{}) error {
 		length := binary.BigEndian.Uint16(addrLen[:])
 
 		var addrBytes [34]byte
+		if length > 34 {
+			return fmt.Errorf("Cannot read %d bytes into addrBytes", length)
+		}
 		if _, err = io.ReadFull(r, addrBytes[:length]); err != nil {
 			return err
 		}