diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua
index 058cb522e..5b2f34241 100644
--- a/Moose Development/Moose/Wrapper/Unit.lua	
+++ b/Moose Development/Moose/Wrapper/Unit.lua	
@@ -120,7 +120,10 @@ function UNIT:Register( UnitName )
   local unit=Unit.getByName(self.UnitName)
   
   if unit then
-    self.GroupName=unit:getGroup():getName()
+    local group = unit:getGroup()
+    if group then 
+      self.GroupName=group:getName()
+    end
   end
   
   -- Set event prio.