Fixes #7037 - We now get a message suggesting a possible cause
Merge pull request #4553 from xprazak2/organization-nil-fix

Error message fix when organizations disabled