refcount errors on error paths

Merged Mark Andrews requested to merge misc-onerror-refcount-fixes into master

privately submitted fixes.

Merge request reports