[TIMOB-12483] Beefed up options checking