Fix issue #273 - Failure to patch on the client side is not handled

Closes #273
Same here - we have to be careful about possible timing issues.