only catch errors if they are in an extension
Merge pull request #1761 from rossriley/extensions-improvements-fixes

only catch errors if they are in an extension