diff --git a/src/leccalc/aggreports.cpp b/src/leccalc/aggreports.cpp
index 01e39868..e3cd3b09 100644
--- a/src/leccalc/aggreports.cpp
+++ b/src/leccalc/aggreports.cpp
@@ -953,6 +953,7 @@ void aggreports::WriteWheatsheafMean(const std::vector<int> &fileIDs,
     int i = 1;
 
     for (auto mc : rmc) {
+      if (mc.count == 0) continue;   // Skip unpopulated entries
 
       if (WriteEPTOutput != nullptr) {
 	(this->*WriteEPTOutput)(fileIDs, s.first, epcalc, eptype, mc.retperiod,
diff --git a/src/leccalc/leccalc.cpp b/src/leccalc/leccalc.cpp
index d44814c3..b124a0f7 100644
--- a/src/leccalc/leccalc.cpp
+++ b/src/leccalc/leccalc.cpp
@@ -558,10 +558,12 @@ namespace leccalc {
 					}
 				}
 			}
-			summaryids.clear();
-			summaryids.insert(last_summary_id);
-			outputaggreports(agg, summaryids, out_loss, samplesize,
-					 fileIDs_occ, fileIDs_agg, hasEPT);
+			if (last_summary_id != -1) {
+				summaryids.clear();
+				summaryids.insert(last_summary_id);
+				outputaggreports(agg, summaryids, out_loss, samplesize,
+						 fileIDs_occ, fileIDs_agg, hasEPT);
+			}
 		} else {
 			if (indexFiles.size() > 0) {
 				fprintf(stderr, "%d summary index files missing: "