diff --git a/R/fetchNASIS_components.R b/R/fetchNASIS_components.R
index 98c63c2c..9a01a185 100644
--- a/R/fetchNASIS_components.R
+++ b/R/fetchNASIS_components.R
@@ -103,7 +103,8 @@
     }
     
   } else {
-    stop("No horizon data in NASIS component query result.", call. = FALSE)
+    ds <- ifelse(SS, "NASIS selected set", "NASIS local database")
+    stop("No component/horizon records in ", ds, call. = FALSE)
   }
 
   # add site data to object
diff --git a/R/get_vegplot_data_from_NASIS_db.R b/R/get_vegplot_data_from_NASIS_db.R
index 8fade333..db121810 100644
--- a/R/get_vegplot_data_from_NASIS_db.R
+++ b/R/get_vegplot_data_from_NASIS_db.R
@@ -68,7 +68,7 @@ get_vegplot_from_NASIS_db <- function(SS = TRUE,
   # test for no data
   if (nrow(d.vegplot) == 0) {
     ds <- ifelse(SS, "NASIS selected set", "NASIS local database")
-    stop('No NASIS Site+Vegetation Plot records in ', ds, '!', call. = FALSE)
+    stop('No NASIS site/vegetation plot records in ', ds, call. = FALSE)
   }
   # uncode metadata domains
   d <- uncode(d.vegplot, dsn = dsn)