Add missing checks