Hotfix/extension error handler

This fixes #1661 for me.  Ping @rossriley