Improved option validation