GH-4 Better error handling.