Correct error handling. For real this time.