1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlinePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlinePage.java
index f488db339..0f5bf7833 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlinePage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlinePage.java
@@ -37,7 +37,7 @@ public class TaskEditorOutlinePage extends ContentOutlinePage {
 		} else {
 			this.model = null;
 		}
-		if (viewer != null) {
+		if (viewer != null && viewer.getControl() != null && !viewer.getControl().isDisposed()) {
 			viewer.setInput(this.model);
 			viewer.expandAll();
 			viewer.refresh(true);