diff --git a/sdk/java/core/src/main/kotlin/com/keepersecurity/secretsManager/core/RecordData.kt b/sdk/java/core/src/main/kotlin/com/keepersecurity/secretsManager/core/RecordData.kt
index 5cd81e3d..24aea773 100644
--- a/sdk/java/core/src/main/kotlin/com/keepersecurity/secretsManager/core/RecordData.kt
+++ b/sdk/java/core/src/main/kotlin/com/keepersecurity/secretsManager/core/RecordData.kt
@@ -15,7 +15,7 @@ data class KeeperRecordData @JvmOverloads constructor(
     var notes: String? = null
 ) {
     inline fun <reified T> getField(): T? {
-        return (fields + custom).find { x -> x is T } as T
+        return (fields + (custom ?: listOf())).find { x -> x is T } as? T
     }
 
     fun getField(clazz: Class<out KeeperRecordField>): KeeperRecordField? {