gchq · t92549 · Oct 13, 2022 · Oct 11, 2022
diff --git a/core/src/main/java/uk/gov/gchq/koryphe/impl/predicate/CollectionContains.java b/core/src/main/java/uk/gov/gchq/koryphe/impl/predicate/CollectionContains.java
@@ -55,7 +55,7 @@ public void setValue(final Object value) {
 
     @Override
     public boolean test(final Collection<?> input) {
-        return input.contains(value);
+        return input != null && input.contains(value);
     }
 
     @Override

diff --git a/core/src/test/java/uk/gov/gchq/koryphe/impl/predicate/CollectionContainsTest.java b/core/src/test/java/uk/gov/gchq/koryphe/impl/predicate/CollectionContainsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2022 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,6 +100,24 @@ public void shouldRejectEmptySets() {
         assertThat(filter).rejects(new HashSet<>());
     }
 
+    @Test
+    public void shouldRejectNullLists() {
+        // Given
+        final CollectionContains filter = new CollectionContains(VALUE1);
+
+        // When / Then
+        assertThat(filter).rejects((ArrayList<?>) null);
+    }
+
+    @Test
+    public void shouldRejectNullSets() {
+        // Given
+        final CollectionContains filter = new CollectionContains(VALUE1);
+
+        // When / Then
+        assertThat(filter).rejects((HashSet<?>) null);
+    }
+
     @Test
     public void shouldJsonSerialiseAndDeserialise() throws IOException {
         // Given