#24 Add missing default checks