diff --git a/Tests/TestCesium3DTileset.cs b/Tests/TestCesium3DTileset.cs
index af094e6c..3a174a4c 100644
--- a/Tests/TestCesium3DTileset.cs
+++ b/Tests/TestCesium3DTileset.cs
@@ -140,7 +140,20 @@ public IEnumerator SampleHeightMostDetailedFailsIfTilesetFailsToLoad()
 
         yield return new WaitForTask(task);
 
-        Assert.NotNull(task.Exception);
-        Assert.IsTrue(task.Exception.Message.Contains("failed to load"));
+        CesiumSampleHeightResult result = task.Result;
+        Assert.IsNotNull(result);
+        Assert.IsNotNull(result.longitudeLatitudeHeightPositions);
+        Assert.IsNotNull(result.sampleSuccess);
+        Assert.IsNotNull(result.warnings);
+        Assert.AreEqual(result.longitudeLatitudeHeightPositions.Length, 1);
+        Assert.AreEqual(result.sampleSuccess.Length, 1);
+        Assert.AreEqual(result.warnings.Length, 1);
+
+        Assert.AreEqual(result.sampleSuccess[0], false);
+        Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].x, 151.20972, 1e-12);
+        Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].y, -33.87100, 1e-12);
+        Assert.AreEqual(result.longitudeLatitudeHeightPositions[0].z, 1.0, 1e-12);
+
+        Assert.IsTrue(result.warnings[0].Contains("failed to load"));
     }
 }
\ No newline at end of file
diff --git a/native~/Runtime/src/Cesium3DTilesetImpl.cpp b/native~/Runtime/src/Cesium3DTilesetImpl.cpp
index 1d09afbc..fde18b58 100644
--- a/native~/Runtime/src/Cesium3DTilesetImpl.cpp
+++ b/native~/Runtime/src/Cesium3DTilesetImpl.cpp
@@ -412,19 +412,30 @@ Cesium3DTilesetImpl::SampleHeightMostDetailed(
         position.z));
   }
 
-  size_t count = positions.size();
-
-  CesiumAsync::Future<SampleHeightResult> future =
-      this->getTileset()
-          ? this->getTileset()->sampleHeightMostDetailed(positions)
-          : getAsyncSystem().createResolvedFuture(
-                Cesium3DTilesSelection::SampleHeightResult{
-                    std::move(positions),
-                    std::vector<bool>(count, false),
-                    {"Could not sample heights from tileset because it has not "
-                     "been created."}});
-
-  std::move(future)
+  auto sampleHeights = [this, &positions]() mutable {
+    if (this->getTileset()) {
+      return this->getTileset()
+          ->sampleHeightMostDetailed(positions)
+          .catchImmediately([positions = std::move(positions)](
+                                std::exception&& exception) mutable {
+            std::vector<bool> sampleSuccess(positions.size(), false);
+            return Cesium3DTilesSelection::SampleHeightResult{
+                std::move(positions),
+                std::move(sampleSuccess),
+                {exception.what()}};
+          });
+    } else {
+      std::vector<bool> sampleSuccess(positions.size(), false);
+      return getAsyncSystem().createResolvedFuture(
+          Cesium3DTilesSelection::SampleHeightResult{
+              std::move(positions),
+              std::move(sampleSuccess),
+              {"Could not sample heights from tileset because it has not "
+               "been created."}});
+    }
+  };
+
+  sampleHeights()
       .thenImmediately(
           [promise](Cesium3DTilesSelection::SampleHeightResult&& result) {
             System::Array1<Unity::Mathematics::double3> positions(
diff --git a/native~/extern/cesium-native b/native~/extern/cesium-native
index b56b1a2e..31e93ac2 160000
--- a/native~/extern/cesium-native
+++ b/native~/extern/cesium-native
@@ -1 +1 @@
-Subproject commit b56b1a2ee709e1c9b53996a6073c66d9cf01955b
+Subproject commit 31e93ac2992eeac7600357710dc50b7c70d54b85