Merge pull request #422 from ianbattersby/bz6389-InvalidSwitch