More cleanup in error handling.
1 file changed