Added missing checks