diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
index aec0192f03f..c06c52374d6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
@@ -356,12 +356,13 @@ public class BuildConsolePage extends Page
 						return;
 				}
 			}
-			selection = new StructuredSelection(getConsole().getConsoleManager().getLastBuiltProject());
+			IProject project = getConsole().getConsoleManager().getLastBuiltProject();
+			if (project != null)
+				selection = new StructuredSelection(project);
 		}
 		selectionChanged(null, selection);
 	}
 
-
 	boolean setSelectionFromEditor(IEditorPart part) {
 		if (part == null)
 			return false;