diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua
index 15c88a013..f30c338fe 100644
--- a/Moose Development/Moose/Tasking/Task.lua	
+++ b/Moose Development/Moose/Tasking/Task.lua	
@@ -585,7 +585,9 @@ function TASK:UnAssignFromGroups()
   self:F2()
   
   for TaskGroupName, TaskGroup in pairs( self.SetGroup:GetSet() ) do
-    self:UnAssignFromGroup( TaskGroup )
+    if self:IsGroupAssigned(TaskGroup) then
+      self:UnAssignFromGroup( TaskGroup )
+    end
   end
 end