Adding a bit of option validation