Add check for existence of step object