Cleanup ext options and error handling

Closes #447