diff --git a/impexp-client-cli/src/main/java/org/citydb/cli/operation/deleter/QueryOption.java b/impexp-client-cli/src/main/java/org/citydb/cli/operation/deleter/QueryOption.java
index a4126efe7..98cfbe70b 100644
--- a/impexp-client-cli/src/main/java/org/citydb/cli/operation/deleter/QueryOption.java
+++ b/impexp-client-cli/src/main/java/org/citydb/cli/operation/deleter/QueryOption.java
@@ -68,14 +68,20 @@ public class QueryOption implements CliOption {
     @CommandLine.ArgGroup
     private XMLQueryOption xmlQueryOption;
 
+    private boolean canCreateQueryConfig() {
+        return (
+            typeNamesOption != null
+            || featureVersionOption != null
+            || resourceIdOption != null
+            || databaseIdOption != null
+            || boundingBoxOption != null
+            || counterOption != null
+            || sqlSelectOption != null
+        );
+    }
+
     public QueryConfig toQueryConfig() {
-        if (typeNamesOption != null
-                || featureVersionOption != null
-                || resourceIdOption != null
-                || databaseIdOption != null
-                || boundingBoxOption != null
-                || counterOption != null
-                || sqlSelectOption != null) {
+        if (canCreateQueryConfig()) {
             QueryConfig queryConfig = new QueryConfig();
             List<AbstractPredicate> predicates = new ArrayList<>();