Fixed an issue with handling of options that was causing failures if no options were specified at all (admittedly a rare case, but important sometimes for testing).