Account for when options only are passed

This is a quick fix. There should be a better way to deal with this but
this will do for now