Reinstate error handling.