diff --git a/R/DensityEstimator.R b/R/DensityEstimator.R
index 05989ed..41293e1 100755
--- a/R/DensityEstimator.R
+++ b/R/DensityEstimator.R
@@ -106,7 +106,7 @@ Gibbs.subclone.density.est <- function(burden, GS.data, pngFile, density.smooth
   
   V.h.cols <- GS.data$V.h
   if("pi.h" %in% names(GS.data)){
-    if(is.na(indices)){
+    if(all(is.na(indices))){
       pi.h.cols <- GS.data$pi.h
     }else{
       pi.h.cols <- GS.data$pi.h[,,indices]
diff --git a/R/DirichletProcessClustering.R b/R/DirichletProcessClustering.R
index 541c86a..c55bd30 100755
--- a/R/DirichletProcessClustering.R
+++ b/R/DirichletProcessClustering.R
@@ -558,7 +558,7 @@ writeStandardFinalOutput = function(clustering, dataset, most.similar.mut, outfi
   ########################################################################
   # Check if mutation sampling has been done, if so, unpack and assign here
   ########################################################################
-  if (!is.na(most.similar.mut) && assign_sampled_muts) {
+  if (!is.null(most.similar.mut) && any(!is.na(most.similar.mut)) && isTRUE(assign_sampled_muts)) {
     res = unsample_mutations(dataset, clustering)
     dataset = res$dataset
     clustering = res$clustering