Fix options error handling
Merge branch 'master' into temp