diff --git a/src/kits/tracker/FindPanel.cpp b/src/kits/tracker/FindPanel.cpp
index d8fd0fc0e5..2fc403449c 100644
--- a/src/kits/tracker/FindPanel.cpp
+++ b/src/kits/tracker/FindPanel.cpp
@@ -3177,20 +3177,20 @@ private:
 void
 DeleteTransientQueriesTask::StartUpTransientQueryCleaner()
 {
+	TTracker* tracker = dynamic_cast<TTracker*>(be_app);
+	ASSERT(tracker != NULL);
+
+	if (tracker == NULL)
+		return;
 	// set up a task that wakes up when the machine is idle and starts
 	// killing off old transient queries
 	DeleteTransientQueriesFunctor* worker
 		= new DeleteTransientQueriesFunctor(new DeleteTransientQueriesTask());
 
-	TTracker* tracker = dynamic_cast<TTracker*>(be_app);
-	ASSERT(tracker != NULL);
-
-	if (tracker != NULL) {
-		tracker->MainTaskLoop()->RunWhenIdle(worker,
-			30 * 60 * 1000000,	// half an hour initial delay
-			5 * 60 * 1000000,	// idle for five minutes
-			10 * 1000000);
-	}
+	tracker->MainTaskLoop()->RunWhenIdle(worker,
+		30 * 60 * 1000000,	// half an hour initial delay
+		5 * 60 * 1000000,	// idle for five minutes
+		10 * 1000000);
 }