diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java
index c4beefe008f..1c9f753f5c5 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java
@@ -235,6 +235,8 @@ public class MakeContentProvider implements ITreeContentProvider, IMakeTargetLis
 		Display.getDefault().asyncExec(new Runnable() {
 			@Override
 			public void run() {
+				if (viewer == null || viewer.getControl() == null || viewer.getControl().isDisposed())
+					return;
 				viewer.refresh();
 			}
 		});