diff --git a/src/subcommand/autoindex_main.cpp b/src/subcommand/autoindex_main.cpp
index ab72408d31..962f650a77 100644
--- a/src/subcommand/autoindex_main.cpp
+++ b/src/subcommand/autoindex_main.cpp
@@ -352,6 +352,9 @@ int main_autoindex(int argc, char** argv) {
     }
     if (!gbz_name.empty()) {
         registry.provide("GBZ", gbz_name);
+        // Also mark this as the Giraffe GBZ so if we index for Giraffe we won't duplicate it.
+        // TODO: Why are these separate?
+        registry.provide("Giraffe GBZ", gbz_name);
     }
 
 
diff --git a/test/t/15_vg_surject.t b/test/t/15_vg_surject.t
index 28d8992c09..2f852beb0b 100644
--- a/test/t/15_vg_surject.t
+++ b/test/t/15_vg_surject.t
@@ -202,6 +202,7 @@ is "${?}" "1" "Surjection fails when using the wrong graph for GAM"
 is "$(cat err.txt | grep 'cannot be interpreted' | wc -l)" "1" "Surjection of GAM to the wrong graph reports the problem"
 vg surject -x tiny.vg -s -t 1 -m mapped.gamp >/dev/null 2>err.txt
 is "${?}" "1" "Surjection fails when using the wrong graph for GAMP"
+cat err.txt 1>&2
 is "$(cat err.txt | grep 'cannot be interpreted' | wc -l)" "1" "Surjection of GAMP to the wrong graph reports the problem"
 
 rm x.vg x.pathdup.vg x.xg x.gcsa x.gcsa.lcp x.gam mapped.gam mapped.gamp tiny.vg err.txt