Finished unifying of error handling.