MOB-1891

I wonder if it would be more clear if you pass the `on error` value here as well ?