diff --git a/collects/meta/pkg-index/official/main.rkt b/collects/meta/pkg-index/official/main.rkt
index 183bd21418..2d90b0d7d2 100644
--- a/collects/meta/pkg-index/official/main.rkt
+++ b/collects/meta/pkg-index/official/main.rkt
@@ -160,12 +160,14 @@
     (string->url pkg-url-str))
   (match (url-scheme pkg-url)
     ["github"
-     (match-define (list* user repo branch path)
-                   (url-path pkg-url))
-     (url->string
-      (struct-copy url pkg-url
-                   [scheme "http"]
-                   [path (list* user repo (path/param "tree" empty) branch path)]))]
+     (match (url-path pkg-url)
+       [(list* user repo branch path)
+        (url->string
+         (struct-copy url pkg-url
+                      [scheme "http"]
+                      [path (list* user repo (path/param "tree" empty) branch path)]))]
+       [_
+        pkg-url-str])]
     [_
      pkg-url-str]))