added another kind of error handling
code cleanup
removed defined error condition