Issue 68, 67: add additional exception handling to patching code
Merge pull request #70 from mbox/master

Issue 68, 67: add additional exception handling to patching code