We need to be more explicit on errors but that's not part of that pull-request.