Added null check for extras step.