Cleanup ext options and error handling
Merge pull request #478 from walmartlabs/user/eran

Cleanup ext options and error handling