Added fail-checking on undefined steps to avoid errors