Merge pull request #1952 from yebblies/missingdefault

Add missing default cases to switches