diff --git a/src/com/massivecraft/factions/task/TaskEconLandReward.java b/src/com/massivecraft/factions/task/TaskEconLandReward.java
index 7960edd6..87c87250 100644
--- a/src/com/massivecraft/factions/task/TaskEconLandReward.java
+++ b/src/com/massivecraft/factions/task/TaskEconLandReward.java
@@ -5,6 +5,7 @@ import org.bukkit.plugin.Plugin;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.entity.FactionColl;
 import com.massivecraft.factions.entity.MConf;
+import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.ModuloRepeatTask;
 import com.massivecraft.massivecore.util.TimeUnit;
 
@@ -42,6 +43,7 @@ public class TaskEconLandReward extends ModuloRepeatTask
 	@Override
 	public void invoke(long now)
 	{
+		if ( ! MassiveCore.isTaskServer()) return;
 		FactionColl.get().econLandRewardRoutine();
 	}
 	
diff --git a/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java b/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java
index 096877b8..94d55e16 100644
--- a/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java
+++ b/src/com/massivecraft/factions/task/TaskPlayerDataRemove.java
@@ -5,6 +5,7 @@ import org.bukkit.plugin.Plugin;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.entity.MPlayerColl;
+import com.massivecraft.massivecore.MassiveCore;
 import com.massivecraft.massivecore.ModuloRepeatTask;
 import com.massivecraft.massivecore.util.TimeUnit;
 
@@ -42,6 +43,7 @@ public class TaskPlayerDataRemove extends ModuloRepeatTask
 	@Override
 	public void invoke(long now)
 	{
+		if ( ! MassiveCore.isTaskServer()) return;
 		MPlayerColl.get().considerRemovePlayerMillis();
 	}