Ok that's fine :) My error handling it's ready to be merged, I'll just create a pull request in a moment.