Changing the error handling to be more benign.