whitespace cleanup and 'better' error message