Fix issue #1245 - options which don't exist
Merge pull request #1258 from jrfnl/Issue-1245-ensure-options-exist

Fix issue #1245 - options which don't exist, props @jrfnl