diff --git a/confluent_server/confluent/messages.py b/confluent_server/confluent/messages.py
index 304f32e5..1d31dc12 100644
--- a/confluent_server/confluent/messages.py
+++ b/confluent_server/confluent/messages.py
@@ -1801,7 +1801,7 @@ class CryptedAttributes(Attributes):
         nkv = {}
         for key in kv:
             nkv[key] = {'isset': False}
-            if 'hashvalue' in kv[key]:
+            if kv[key] and 'hashvalue' in kv[key]:
                 targkey = 'hashvalue'
             else:
                 targkey = 'cryptvalue'