diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 250138520fcc2c1116244379580c28bf9ba43bf3..fa657578fb8800e960606010415bc1d204dd0c8d 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -198,13 +198,10 @@ sub feature_pickaxe {
 
 our $project = $cgi->param('p');
 if (defined $project) {
-	if (!validate_input($project)) {
-		die_error(undef, "Invalid project parameter");
-	}
-	if (!(-d "$projectroot/$project")) {
-		die_error(undef, "No such directory");
-	}
-	if (!(-e "$projectroot/$project/HEAD")) {
+	if (!validate_input($project) ||
+	    !(-d "$projectroot/$project") ||
+	    !(-e "$projectroot/$project/HEAD")) {
+		undef $project;
 		die_error(undef, "No such project");
 	}
 }