diff --git a/src/main/java/com/hp/autonomy/parametricvalues/ParametricRequest.java b/src/main/java/com/hp/autonomy/parametricvalues/ParametricRequest.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/hp/autonomy/parametricvalues/ParametricRequest.java
+++ b/src/main/java/com/hp/autonomy/parametricvalues/ParametricRequest.java
@@ -14,6 +14,7 @@ import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.Set;
 
 @Data
@@ -32,7 +33,7 @@ public class ParametricRequest implements Serializable {
         this.databases = databases;
         this.query = query;
         this.fieldText = fieldText;
-        this.fieldNames = fieldNames;
+        this.fieldNames = fieldNames == null ? Collections.<String>emptySet() : fieldNames;
     }
 
     @JsonPOJOBuilder(withPrefix = "set")
[CCUK-<I>] The fieldname parameter can be sent as null, so the parametric request replaces the field names with the empty set to prevent null pointer exceptions. [rev: alex.scown]