Index: /branches/eraser6/pluginsRewrite/Eraser.Manager/Task.cs
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser.Manager/Task.cs	(revision 2498)
+++ /branches/eraser6/pluginsRewrite/Eraser.Manager/Task.cs	(revision 2499)
@@ -98,7 +98,5 @@
 			internal set
 			{
-				if (value == null)
-					throw new ArgumentNullException("Task.Executor cannot be null");
-				if (executor != null)
+				if (executor != null && value != null)
 					throw new InvalidOperationException("A task can only belong to one " +
 						"executor at any one time");