Added extra guard for check_over method