diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/processing/JobManager.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/processing/JobManager.java
index a551bad48f2..a55008cfd19 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/processing/JobManager.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/processing/JobManager.java
@@ -139,7 +139,7 @@ public abstract class JobManager implements Runnable {
 				for (int i = jobStart; i <= jobEnd; i++) {
 					currentJob = awaitingJobs[i];
 					awaitingJobs[i] = null;
-					if (!(jobFamily == null
+					if (!(jobFamily == null || currentJob == null
 						|| currentJob.belongsTo(jobFamily))) { // copy down, compacting
 						awaitingJobs[++loc] = currentJob;
 					} else {