Throws if no options; Fixes in tests