Added success check short circuit