diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java
index 8306f3dc224..2ee982707b6 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java
@@ -359,6 +359,8 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded
 	// Update the UI according to actual content of fSessionData,
 	// which must be not null.
 	private void updateSessionDataContents() {
+		if (fSessionData == null)
+			return;
 		
 		if (fViewer == null || fViewer.getControl() == null)
 			return;