diff --git a/bin/cac-get-server-by b/bin/cac-get-server-by
index b46062518..b6d6b4ba3 100755
--- a/bin/cac-get-server-by
+++ b/bin/cac-get-server-by
@@ -7,7 +7,9 @@ cac-listservers \
     --arg v "$2" \
     '
       map(select(.[$k]==$v)) |
-      if (. | length) == 1 then
+      if (. | length) == 0 then
+        null
+      elif (. | length) == 1 then
         .[0]
       else
         .