whitespace cleanup... fixes some error handling