diff --git a/rolluptool/src/classes/LREngine.cls b/rolluptool/src/classes/LREngine.cls
index 0d5a894d..1396ac47 100644
--- a/rolluptool/src/classes/LREngine.cls
+++ b/rolluptool/src/classes/LREngine.cls
@@ -656,6 +656,9 @@ public class LREngine {
      **/
     public abstract class QueryExecutor {
         public virtual List<SObject> query(String query, Set<Id> masterIds) {
+            if ( masterIds == null || masterIds.isEmpty() ) {
+                return new List<SObject>();
+            }
             return Database.query(query);
         }
     }
@@ -678,4 +681,4 @@ public class LREngine {
         }
     }
 
-}
\ No newline at end of file
+}