Revert "Minor changes to make error messages consistent, and possibly less crashy. Still need unit tests to trigger this code."

This reverts commit 8c0819becaa18bf7c4db1f8fc2a8a8eaf52afa8b.
Revert "Improve message for glossary error"

This reverts commit 0b3706702f647e252bd6a7a068c03bd5d717e550.