Iteration on error handling, ref #13