diff --git a/lnwire/node_announcement.go b/lnwire/node_announcement.go
index e50948f0..3b3393c8 100644
--- a/lnwire/node_announcement.go
+++ b/lnwire/node_announcement.go
@@ -39,12 +39,17 @@ func NewAlias(s string) (Alias, error) {
 func newAlias(data []byte) (Alias, error) {
 	var a [32]byte
 
-	aliasEnd := len(data)
-	for data[aliasEnd-1] == 0 && aliasEnd > 0 {
+	rawAlias := data
+	if len(data) > aliasSpecLen {
+		rawAlias = data[:aliasSpecLen]
+	}
+
+	aliasEnd := len(rawAlias)
+	for rawAlias[aliasEnd-1] == 0 && aliasEnd > 0 {
 		aliasEnd--
 	}
 
-	copy(a[:aliasEnd], data[:aliasEnd])
+	copy(a[:aliasEnd], rawAlias[:aliasEnd])
 
 	return Alias{
 		data:     a,
@@ -94,6 +99,8 @@ type NodeAnnouncement struct {
 	// maps and graphs
 	RGBColor RGB
 
+	// TODO(roasbeef): add the global features here
+
 	// pad is used to reserve to additional bytes for future
 	// usage.
 	pad uint16