Merge remote-tracking branch 'origin/rel-1715361277'

Crunch-io · May 10, 2024 · 538554d · 538554d
2 parents 20f23a8 + 79fdab2
commit 538554d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/R/weight.R b/R/weight.R
@@ -29,7 +29,13 @@ setMethod("weight", "CrunchDataset", function(x) {
         # weight. `loadDataset` shouldn't be costly because the dataset is
         # already cached.
         full_ds <- loadDataset(datasetReference(x))
-        w <- CrunchVariable(allVariables(full_ds)[[w]], filter = activeFilter(x))
+        w_var <- allVariables(full_ds)[[w]]
+        # If the variable doesn't exist return NULL to mimic old backend
+        # behavior, since we already have everything we need to check
+        if (is.null(w_var)) {
+            return(NULL)
+        }
+        w <- CrunchVariable(w_var, filter = activeFilter(x))
     }
     return(w)
 })