Fix null group NPE

This might be the one that has plagued us for a long time.
Merge branch 'uuids' of github.com:erocs/Citadel into uuids