Looking at the implementation it appears we need to find a way to trigger a non-zero error to maintain 100% code coverage when changing this to handle errors. @public have you looked at this before? I just spent a little bit of time and it was not immediately obvious to me how to do it...