Don't try to read things with a : on the end as cross references
Improve production of various error messages