diff --git a/Libraries/Opc.Ua.Client/Session.cs b/Libraries/Opc.Ua.Client/Session.cs
index 33067289f..244c65fae 100644
--- a/Libraries/Opc.Ua.Client/Session.cs
+++ b/Libraries/Opc.Ua.Client/Session.cs
@@ -1860,6 +1860,10 @@ public async Task<DataDictionary> LoadDataDictionary(ReferenceDescription dictio
                 {
                     namespaces[((NodeId)referenceNodeIds[ii])] = (string)nameSpaceValues[ii];
                 }
+                else
+                {
+                    Utils.LogWarning("Failed to load namespace {0}: {1}", namespaceNodeIds[ii], errors[ii]);
+                }
             }
 
             // build the namespace/schema import dictionary
@@ -1867,9 +1871,9 @@ public async Task<DataDictionary> LoadDataDictionary(ReferenceDescription dictio
             foreach (var r in references)
             {
                 NodeId nodeId = ExpandedNodeId.ToNodeId(r.NodeId, NamespaceUris);
-                if (schemas.TryGetValue(nodeId, out var schema))
+                if (schemas.TryGetValue(nodeId, out var schema) && namespaces.TryGetValue(nodeId, out var ns))
                 {
-                    imports[namespaces[nodeId]] = schema;
+                    imports[ns] = schema;
                 }
             }