Better checking on parsing of steps