Let's not do anything to ``organization``. We either have one or not (see my comment about allowing ``None``)