I don't think this short circuit is necessary anymore (As we do the same thing in the DraftList constructor and it's better there)