Fixed: Check for null group