diff --git a/src/main/java/com/oneidentity/safeguard/safeguardjava/SafeguardA2AContext.java b/src/main/java/com/oneidentity/safeguard/safeguardjava/SafeguardA2AContext.java
index f73bf24..2305cff 100644
--- a/src/main/java/com/oneidentity/safeguard/safeguardjava/SafeguardA2AContext.java
+++ b/src/main/java/com/oneidentity/safeguard/safeguardjava/SafeguardA2AContext.java
@@ -132,7 +132,7 @@ public List<IA2ARetrievableAccount> getRetrievableAccounts()  throws ObjectDispo
                 account.setDescription(registration.getDescription());
                 account.setDisabled(registration.isDisabled() || retrieval.isAccountDisabled());
                 account.setAccountId(retrieval.getAccountId());
-                account.setApiKey(retrieval.getApiKey().toCharArray());
+                account.setApiKey(retrieval.getApiKey() == null ? null : retrieval.getApiKey().toCharArray());
                 account.setAssetId(retrieval.getAssetId());
                 account.setAssetName(retrieval.getAssetName());
                 account.setAssetNetworkAddress(retrieval.getAssetNetworkAddress());