Clarify: better error handling