diff --git a/R/cv_varsel.R b/R/cv_varsel.R
index 246759465..94a3a1b1a 100644
--- a/R/cv_varsel.R
+++ b/R/cv_varsel.R
@@ -549,10 +549,12 @@ kfold_varsel <- function(refmodel, method, nterms_max, ndraws,
   ## List of K elements, each containing d_train, p_pred, etc. corresponding
   ## to each fold.
   make_list_cv <- function(refmodel, d_test, msg) {
-    nclusters_pred <- min(
-      refmodel$nclusters_pred,
-      nclusters_pred
-    )
+    if (!is.null(nclusters_pred) || !is.null(refmodel$nclusters_pred)) {
+      nclusters_pred <- min(
+        refmodel$nclusters_pred,
+        nclusters_pred
+      )
+    }
     p_sel <- .get_refdist(refmodel, ndraws, nclusters, seed = seed)
     p_pred <- .get_refdist(refmodel, ndraws_pred, nclusters_pred, seed = seed)
     newdata <- d_test$newdata