fixes #2877: deletion of the organization or location in the context no longer breaks the session