diff --git a/api/repository.go b/api/repository.go
index 260757538..0671e47a0 100644
--- a/api/repository.go
+++ b/api/repository.go
@@ -121,6 +121,10 @@ func (ra *RepositoryAPI) Delete() {
 		ra.CustomAbort(http.StatusInternalServerError, "")
 	}
 
+	if project == nil {
+		ra.CustomAbort(http.StatusNotFound, fmt.Sprintf("project %s not found", projectName))
+	}
+
 	if project.Public == 0 {
 		userID := ra.ValidateUser()
 		if !hasProjectAdminRole(userID, project.ProjectID) {
@@ -270,6 +274,10 @@ func (ra *RepositoryAPI) GetManifests() {
 		ra.CustomAbort(http.StatusInternalServerError, "")
 	}
 
+	if project == nil {
+		ra.CustomAbort(http.StatusNotFound, fmt.Sprintf("project %s not found", projectName))
+	}
+
 	if project.Public == 0 {
 		userID := ra.ValidateUser()
 		if !checkProjectPermission(userID, project.ProjectID) {