diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
index 1582a283188a80df540a79dae3678dd9592c2708..360accae41dbc5a5c23af12148ff62690953ec70 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
@@ -131,14 +131,17 @@ public final class CurrentWorkSpaceProjectBean {
 		// Remember the given parameters
 		this.project = project;
 		this.projectName = projectName;
-		// Remember the current time! This is important for the later comparison of the time stamps.
-		this.resetTimeStamp();
-		// Update the class loader
-		this.reloadClassLoader();
-		// Add the libraries within the lib-folder to the current model
-		this.addLibrariesToModel();
-		// Load the available readers, filters and repositories
-		this.loadToolPalette();
+
+		if (this.project != null) {
+			// Remember the current time! This is important for the later comparison of the time stamps.
+			this.resetTimeStamp();
+			// Update the class loader
+			this.reloadClassLoader();
+			// Add the libraries within the lib-folder to the current model
+			this.addLibrariesToModel();
+			// Load the available readers, filters and repositories
+			this.loadToolPalette();
+		}
 
 		// Now deliver the correct navigation page
 		return (this.project != null) ? CurrentWorkSpaceProjectBean.PAGE_PROJECT_WORK_SPACE : "";