add missing checks