More robust exception handling.