[237111] Deadlock in DependencyGraphImpl
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
index 7c27b89..e8d601e 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
@@ -426,7 +426,8 @@
 	 * Blocks until the graph is finished updating
 	 */
 	public void waitForAllUpdates(IProgressMonitor monitor) {
-		if(graphUpdateJob.getThread() != Thread.currentThread()) {
+		Thread graphUpdateThread = graphUpdateJob.getThread();
+		if(graphUpdateThread != null && graphUpdateThread != Thread.currentThread()) {
 			try {
 				graphUpdateJob.join();
 			} catch (InterruptedException e) {