Hi,

> Right, the attached diff adds the needed checks assuming there will be
> no more callbacks after an error.

Patch has been applied.  Thanks.

Regards,
-Denis