From 9ecfe40f41c68213dde7cc805a9047f5eca20a20 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Jun 2021 16:54:34 -0500
Subject: [PATCH] Properly handle a null scope

---
 .../dspace/app/rest/converter/SearchEventConverter.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java
index ba977354c5..470a3ac342 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java
@@ -34,9 +34,12 @@ public class SearchEventConverter {
                                                                              null);
         usageSearchEvent.setQuery(searchEventRest.getQuery());
         usageSearchEvent.setDsoType(searchEventRest.getDsoType());
-        IndexableObject scopeObject = scopeResolver.resolveScope(context, String.valueOf(searchEventRest.getScope()));
-        if (scopeObject instanceof DSpaceObject) {
-            usageSearchEvent.setScope((DSpaceObject) scopeObject);
+        if (searchEventRest.getScope() != null) {
+            IndexableObject scopeObject =
+                    scopeResolver.resolveScope(context, String.valueOf(searchEventRest.getScope()));
+            if (scopeObject instanceof DSpaceObject) {
+                usageSearchEvent.setScope((DSpaceObject) scopeObject);
+            }
         }
         usageSearchEvent.setConfiguration(searchEventRest.getConfiguration());
         if (searchEventRest.getAppliedFilters() != null) {