Better option checking in case somebody changes the default option