Move handler checks in constructor