fixes
Option set error handling