Merge pull request #297 from JonRowe/protect_against_edgecase_no_options

Protect against edgecase no options