diff --git a/src/pkg/xml/xml.go b/src/pkg/xml/xml.go
index 6e7b3d30bf..1a8d89ab89 100644
--- a/src/pkg/xml/xml.go
+++ b/src/pkg/xml/xml.go
@@ -761,7 +761,7 @@ Input:
 				if r, ok := entity[s]; ok {
 					text = string(r);
 					haveText = true;
-				} else {
+				} else if p.Entity != nil {
 					text, haveText = p.Entity[s]
 				}
 			}