c7cc14f feat:Added missing checks.