Changed the error handling.