diff --git a/vs4win/Chapter10/WorkingWithEFCore/Program.Modifications.cs b/vs4win/Chapter10/WorkingWithEFCore/Program.Modifications.cs
index fafcba7..e10ba19 100644
--- a/vs4win/Chapter10/WorkingWithEFCore/Program.Modifications.cs
+++ b/vs4win/Chapter10/WorkingWithEFCore/Program.Modifications.cs
@@ -8,7 +8,7 @@ partial class Program
   {
     using (Northwind db = new())
     {
-      if ((db.Products is null) || (db.Products.Count() == 0))
+      if ((db.Products is null) || (!db.Products.Any()))
       {
         Fail("There are no products.");
         return;
diff --git a/vs4win/Chapter10/WorkingWithEFCore/Program.Queries.cs b/vs4win/Chapter10/WorkingWithEFCore/Program.Queries.cs
index 7b8998c..c1a4406 100644
--- a/vs4win/Chapter10/WorkingWithEFCore/Program.Queries.cs
+++ b/vs4win/Chapter10/WorkingWithEFCore/Program.Queries.cs
@@ -34,7 +34,7 @@ partial class Program
         WriteLine();
       }
 
-      if (categories is null)
+      if ((categories is null) || (!categories.Any()))
       {
         Fail("No categories found.");
         return;
@@ -81,7 +81,7 @@ partial class Program
       IQueryable<Category>? categories = db.Categories?
         .Include(c => c.Products.Where(p => p.Stock >= stock));
 
-      if (categories is null)
+      if ((categories is null) || (!categories.Any()))
       {
         Fail("No categories found.");
         return;
@@ -119,7 +119,7 @@ partial class Program
         .Where(product => product.Cost > price)
         .OrderByDescending(product => product.Cost);
 
-      if (products is null)
+      if ((products is null) || (!products.Any()))
       {
         Fail("No products found.");
         return;
@@ -154,7 +154,7 @@ partial class Program
       IQueryable<Product>? products = db.Products?
         .Where(p => EF.Functions.Like(p.ProductName, $"%{input}%"));
 
-      if (products is null)
+      if ((products is null) || (!products.Any()))
       {
         Fail("No products found.");
         return;
@@ -194,6 +194,4 @@ partial class Program
       WriteLine($"Random product: {p.ProductId} {p.ProductName}");
     }
   }
-
 }
-
diff --git a/vscode/Chapter10/WorkingWithEFCore/Program.Modifications.cs b/vscode/Chapter10/WorkingWithEFCore/Program.Modifications.cs
index fafcba7..e10ba19 100644
--- a/vscode/Chapter10/WorkingWithEFCore/Program.Modifications.cs
+++ b/vscode/Chapter10/WorkingWithEFCore/Program.Modifications.cs
@@ -8,7 +8,7 @@ partial class Program
   {
     using (Northwind db = new())
     {
-      if ((db.Products is null) || (db.Products.Count() == 0))
+      if ((db.Products is null) || (!db.Products.Any()))
       {
         Fail("There are no products.");
         return;
diff --git a/vscode/Chapter10/WorkingWithEFCore/Program.Queries.cs b/vscode/Chapter10/WorkingWithEFCore/Program.Queries.cs
index 7b8998c..c1a4406 100644
--- a/vscode/Chapter10/WorkingWithEFCore/Program.Queries.cs
+++ b/vscode/Chapter10/WorkingWithEFCore/Program.Queries.cs
@@ -34,7 +34,7 @@ partial class Program
         WriteLine();
       }
 
-      if (categories is null)
+      if ((categories is null) || (!categories.Any()))
       {
         Fail("No categories found.");
         return;
@@ -81,7 +81,7 @@ partial class Program
       IQueryable<Category>? categories = db.Categories?
         .Include(c => c.Products.Where(p => p.Stock >= stock));
 
-      if (categories is null)
+      if ((categories is null) || (!categories.Any()))
       {
         Fail("No categories found.");
         return;
@@ -119,7 +119,7 @@ partial class Program
         .Where(product => product.Cost > price)
         .OrderByDescending(product => product.Cost);
 
-      if (products is null)
+      if ((products is null) || (!products.Any()))
       {
         Fail("No products found.");
         return;
@@ -154,7 +154,7 @@ partial class Program
       IQueryable<Product>? products = db.Products?
         .Where(p => EF.Functions.Like(p.ProductName, $"%{input}%"));
 
-      if (products is null)
+      if ((products is null) || (!products.Any()))
       {
         Fail("No products found.");
         return;
@@ -194,6 +194,4 @@ partial class Program
       WriteLine($"Random product: {p.ProductId} {p.ProductName}");
     }
   }
-
 }
-