Clarify error message text
major restructuring