error_messages partial bug fixes