Bail early if no extension data has been found
Merge branch 'develop' into hotfix-extension-failure-check
Merge pull request #529 from x-team/hotfix-extension-failure-check

Bail early if no extension data has been found