diff --git a/gracedb/cli_views.py b/gracedb/cli_views.py
index 51440cfb53c4b648ada369528a631bbed2a39f0d..b2a421b8e8a70934213c3d513f7cd6143a950ac4 100644
--- a/gracedb/cli_views.py
+++ b/gracedb/cli_views.py
@@ -41,7 +41,8 @@ def cli_search(request):
             "labels" : lambda e: \
                 ",".join([labelling.label.name for labelling in e.labelling_set.all()]),
             "pipeline" : lambda e: e.pipeline.name,
-            "search"  : lambda e: e.search.name or "",
+            #"search"  : lambda e: e.search.name or "",
+            "search"  : lambda e: e.search.name if e.search else "",
             "gpstime" : lambda e: str(e.gpstime) or "",
             "created" : lambda e: e.created.isoformat(),
             "dataurl" : lambda e: e.weburl(),