diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java
index a3d79b49e..da53487a8 100644
--- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmRecordService.java
@@ -220,7 +220,9 @@ public class KsmRecordService {
      *     The type of field to return.
      *
      * @param fields
-     *     The list of fields to retrieve the field from.
+     *     The list of fields to retrieve the field from. For convenience, this
+     *     may be null. A null list will be considered equivalent to an empty
+     *     list.
      *
      * @param fieldClass
      *     The class representing the type of field to return.
@@ -237,6 +239,10 @@ public class KsmRecordService {
     private <T extends KeeperRecordField> T getField(List<KeeperRecordField> fields,
             Class<T> fieldClass, Pattern labelPattern) {
 
+        // There are no fields if no List was provided at all
+        if (fields == null)
+            return null;
+
         T foundField = null;
         for (KeeperRecordField field : fields) {