[TIMOB-12483] Beefed up options checking
Merge pull request #72 from bryan-m-hughes/timob-12483

[TIMOB-12483] Beefed up options checking