Reinstated error handling.