diff --git a/src/Analysis/Engine/Impl/Values/ProtocolInfo.cs b/src/Analysis/Engine/Impl/Values/ProtocolInfo.cs
index 8c355d6c8..1d7c287ac 100644
--- a/src/Analysis/Engine/Impl/Values/ProtocolInfo.cs
+++ b/src/Analysis/Engine/Impl/Values/ProtocolInfo.cs
@@ -134,7 +134,7 @@ internal override void AddReference(Node node, AnalysisUnit analysisUnit)
 
         public override IEnumerable<ILocationInfo> Locations {
             get {
-                if (!_references.TryGetValue(DeclaringModule, out var defns)) {
+                if (DeclaringModule == null || !_references.TryGetValue(DeclaringModule, out var defns)) {
                     return Enumerable.Empty<ILocationInfo>();
                 }
                 return defns.Definitions.Select(l => l.GetLocationInfo()).ExcludeDefault();
diff --git a/src/Analysis/Engine/Impl/Values/SpecializedNamespace.cs b/src/Analysis/Engine/Impl/Values/SpecializedNamespace.cs
index f1e5346c6..2b12d7669 100644
--- a/src/Analysis/Engine/Impl/Values/SpecializedNamespace.cs
+++ b/src/Analysis/Engine/Impl/Values/SpecializedNamespace.cs
@@ -209,15 +209,15 @@ public override bool IsOfType(IAnalysisSet klass) {
             return _original.IsOfType(klass);
         }
 
-        public override IEnumerable<ILocationInfo> Locations => _original?.Locations?.MaybeEnumerate();
+        public override IEnumerable<ILocationInfo> Locations => _original?.Locations.MaybeEnumerate();
 
         public override string Name => _original == null ? base.Name : _original.Name;
 
-        public override IEnumerable<OverloadResult> Overloads =>_original.Overloads.MaybeEnumerate();
+        public override IEnumerable<OverloadResult> Overloads => _original?.Overloads.MaybeEnumerate();
 
         public override IPythonType PythonType => _original?.PythonType;
 
-        internal override IEnumerable<ILocationInfo> References => _original.References?.MaybeEnumerate();
+        internal override IEnumerable<ILocationInfo> References => _original?.References.MaybeEnumerate();
 
         public override PythonMemberType MemberType => _original == null ? PythonMemberType.Unknown : _original.MemberType;