fix a couple boundary cases that could happen with an empty switcher