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

This reverts commit 8c0819be.