diff --git a/query/src/main/java/com/blipblipcode/query/QueryDelete.kt b/query/src/main/java/com/blipblipcode/query/QueryDelete.kt
index 75cb19c..239cec6 100644
--- a/query/src/main/java/com/blipblipcode/query/QueryDelete.kt
+++ b/query/src/main/java/com/blipblipcode/query/QueryDelete.kt
@@ -64,8 +64,9 @@ class QueryDelete private constructor(
     }
 
     override fun getSqlOperators(): List<SQLOperator<*>> {
-        return operations.values.map {
-            it.operator
+        return buildList {
+            add(where)
+            operations.values.forEach { add(it.operator) }
         }
     }
 
diff --git a/query/src/main/java/com/blipblipcode/query/QuerySelect.kt b/query/src/main/java/com/blipblipcode/query/QuerySelect.kt
index 29423d6..73a1ac9 100644
--- a/query/src/main/java/com/blipblipcode/query/QuerySelect.kt
+++ b/query/src/main/java/com/blipblipcode/query/QuerySelect.kt
@@ -88,8 +88,9 @@ class QuerySelect private constructor(
     }
 
     override fun getSqlOperators(): List<SQLOperator<*>> {
-        return operations.values.map {
-            it.operator
+        return buildList {
+            add(where)
+            operations.values.forEach { add(it.operator) }
         }
     }
 
@@ -319,7 +320,7 @@ class QuerySelect private constructor(
          * @throws IllegalArgumentException if the WHERE clause is not set.
          */
         fun build(): QuerySelect {
-            require(where != null) { "A WHERE clause must be specified." }
+            require(where != null) { "WHERE clause is required for QuerySelect" }
             return QuerySelect(
                 where = where!!,
                 table = table,
diff --git a/query/src/main/java/com/blipblipcode/query/QueryUpdate.kt b/query/src/main/java/com/blipblipcode/query/QueryUpdate.kt
index a5b85d2..c43398d 100644
--- a/query/src/main/java/com/blipblipcode/query/QueryUpdate.kt
+++ b/query/src/main/java/com/blipblipcode/query/QueryUpdate.kt
@@ -75,7 +75,7 @@ class QueryUpdate private constructor(
     }
 
     override fun getSqlOperators(): List<SQLOperator<*>> {
-        return emptyList()
+        return listOf(where)
     }
 
     override fun getTableName(): String {
diff --git a/query/src/test/java/com/blipblipcode/query/QueryDeleteTest.kt b/query/src/test/java/com/blipblipcode/query/QueryDeleteTest.kt
index d54a8d0..fb0d7bf 100644
--- a/query/src/test/java/com/blipblipcode/query/QueryDeleteTest.kt
+++ b/query/src/test/java/com/blipblipcode/query/QueryDeleteTest.kt
@@ -43,7 +43,6 @@ class QueryDeleteTest {
     @Test
     fun `build without where clause throws exception`() {
         val builder = QueryDelete.builder("users")
-            .and("status", SQLOperator.Equals("status", "active"))
 
         assertThrows(IllegalArgumentException::class.java) {
             builder.build()