diff --git a/vtm/src/org/oscim/utils/async/SimpleWorker.java b/vtm/src/org/oscim/utils/async/SimpleWorker.java
index 32f4975f..c2de6a3a 100644
--- a/vtm/src/org/oscim/utils/async/SimpleWorker.java
+++ b/vtm/src/org/oscim/utils/async/SimpleWorker.java
@@ -43,7 +43,8 @@ public abstract class SimpleWorker<T> implements Runnable {
 				mRunning = false;
 				mDelayed = false;
 				mWait = false;
-				cleanup(mTaskTodo);
+				if (mTaskTodo != null)
+					cleanup(mTaskTodo);
 				finish();
 				return;
 			}
@@ -51,7 +52,7 @@ public abstract class SimpleWorker<T> implements Runnable {
 			// FIXME: mTaskTodo == null?
 			if (mDelayed || mTaskTodo == null) {
 
-				if (mDelayed)
+				if (mDelayed && mTaskTodo != null)
 					onMainLoop(mTaskTodo);
 
 				// entered on main-loop