diff --git a/build.sc b/build.sc
index b31dd82..d83974a 100644
--- a/build.sc
+++ b/build.sc
@@ -9,7 +9,7 @@ object lsp extends MavenModule with PublishModule {
 
   def ivyDeps = Agg(
     ivy"org.eclipse.lsp4j:org.eclipse.lsp4j:0.14.0",
-    ivy"software.amazon.smithy:smithy-model:1.23.1",
+    ivy"software.amazon.smithy:smithy-model:1.25.0",
     ivy"io.get-coursier:interface:1.0.4"
   )
 
diff --git a/src/main/java/software/amazon/smithy/lsp/ext/SmithyProject.java b/src/main/java/software/amazon/smithy/lsp/ext/SmithyProject.java
index f983bc9..77c3147 100644
--- a/src/main/java/software/amazon/smithy/lsp/ext/SmithyProject.java
+++ b/src/main/java/software/amazon/smithy/lsp/ext/SmithyProject.java
@@ -271,6 +271,9 @@ private static void collectMemberLocations(
     ) {
         for (Map.Entry<ShapeId, List<MemberShape>> entry : containerMembersMap.entrySet()) {
             Location containerLocation = locations.get(entry.getKey());
+            if (containerLocation == null) {
+                continue;
+            }
             Range containerLocationRange = containerLocation.getRange();
             int memberEndMarker = containerLocationRange.getEnd().getLine();
             // Keep track of previous line to make sure that end marker has been advanced.