Follow-up on better error handling