Fixed options error, dumbed down error handling