More robust check for option having default value