diff --git a/executor/src/witgen/query_processor.rs b/executor/src/witgen/query_processor.rs
index e7e4861d2b..9400021686 100644
--- a/executor/src/witgen/query_processor.rs
+++ b/executor/src/witgen/query_processor.rs
@@ -51,7 +51,10 @@ impl<'a, 'b, T: FieldElement, QueryCallback: super::QueryCallback<T>>
                         Ok(EvalValue::incomplete(IncompleteCause::DataNotYetAvailable))
                     }
                     // All other errors are non-recoverable
-                    e => Err(super::EvalError::ProverQueryError(format!("{e:?}"))),
+                    e => Err(super::EvalError::ProverQueryError(format!(
+                        "Error occurred when evaluating prover query {query} on {}:\n{e:?}",
+                        rows.current_row_index
+                    ))),
                 };
             }
         };