Revert to previously defined onerror handler
Merge pull request #1178 from jankopriva/revert-onerror

Revert to previously defined onerror handler