2 files changed, 6 insertions, 2 deletions

diff --git a/cgit.c b/cgit.c
index c82587b..6e5215e 100644
--- a/cgit.c
+++ b/cgit.c
@@ -291,3 +291,2 @@ static void process_request(void *cbdata)
                 ctx->page.title = "cgit error";
-                ctx->repo = NULL;
                 cgit_print_http_headers(ctx);
diff --git a/ui-shared.c b/ui-shared.c
index 224e5f3..76cd00d 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -579,5 +579,7 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 
+const char *fallback_cmd = "repolist";
+
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
-        return (strcmp(cmd->name, page) ? NULL : "active");
+        return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
@@ -588,2 +590,5 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 
+        if (!cmd && ctx->repo)
+                fallback_cmd = "summary";
+
         html("<table id='header'>\n");