diff --git a/README.org b/README.org
index 507c328..64233d0 100644
--- a/README.org
+++ b/README.org
@@ -540,6 +540,9 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 *Added*
 +  Commands ~org-ql-find~, ~org-ql-find-heading~, and ~org-ql-find-path~, which jump to entries selected using Emacs's built-in completion facilities and Org QL queries (like ~helm-org-ql~, but doesn't require Helm.).
 
+*Changed*
++  Give more useful error message for invalid queries.
+
 ** 0.6.2
 
 *Fixed*
diff --git a/org-ql.el b/org-ql.el
index 0e6965b..d92c1f6 100644
--- a/org-ql.el
+++ b/org-ql.el
@@ -765,12 +765,12 @@ respectively."
                       "#+end_src")
                 t))
 
-(defun org-ql--byte-compile-warning (_string _pos _fill level)
+(defun org-ql--byte-compile-warning (string _pos _fill level)
   "Signal an `org-ql-invalid-query' error.
 Arguments STRING, POS, FILL, and LEVEL are according to
 `byte-compile-log-warning-function'."
   ;; Used as the `byte-compile-log-warning-function' in `org-ql--query-preamble'.
-  (signal 'org-ql-invalid-query level))
+  (signal 'org-ql-invalid-query (list string level)))
 
 (defun org-ql--query-predicate (query)
   "Return predicate function for QUERY."
diff --git a/org-ql.info b/org-ql.info
index 0576cf5..89eede3 100644
--- a/org-ql.info
+++ b/org-ql.info
@@ -1009,6 +1009,9 @@ File: README.info,  Node: 07-pre,  Next: 062,  Up: Changelog
      built-in completion facilities and Org QL queries (like
      ‘helm-org-ql’, but doesn’t require Helm.).
 
+   *Changed*
+   • Give more useful error message for invalid queries.
+
 
 File: README.info,  Node: 062,  Next: 061,  Prev: 07-pre,  Up: Changelog
 
@@ -1653,34 +1656,34 @@ Node: Links36258
 Node: Tips36945
 Node: Changelog37269
 Node: 07-pre38037
-Node: 06238392
-Node: 06138700
-Node: 0639268
-Node: 05242322
-Node: 05142622
-Node: 0543045
-Node: 04944574
-Node: 04844854
-Node: 04745201
-Node: 04645610
-Node: 04546018
-Node: 04446379
-Node: 04346738
-Node: 04246941
-Node: 04147102
-Node: 0447349
-Node: 03251450
-Node: 03151853
-Node: 0352050
-Node: 02355350
-Node: 02255584
-Node: 02155864
-Node: 0256069
-Node: 0160147
-Node: Notes60248
-Node: Comparison with Org Agenda searches60410
-Node: org-sidebar61299
-Node: License61578
+Node: 06238465
+Node: 06138773
+Node: 0639341
+Node: 05242395
+Node: 05142695
+Node: 0543118
+Node: 04944647
+Node: 04844927
+Node: 04745274
+Node: 04645683
+Node: 04546091
+Node: 04446452
+Node: 04346811
+Node: 04247014
+Node: 04147175
+Node: 0447422
+Node: 03251523
+Node: 03151926
+Node: 0352123
+Node: 02355423
+Node: 02255657
+Node: 02155937
+Node: 0256142
+Node: 0160220
+Node: Notes60321
+Node: Comparison with Org Agenda searches60483
+Node: org-sidebar61372
+Node: License61651
 
 End Tag Table