diff --git a/CHANGELOG.md b/CHANGELOG.md
index f36962589ab..a8408bcf57f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,7 @@ TODO.
   * [Kernel] Now verify the type of the binary generators
   * [Kernel] Track the type of tuples in patterns and inside `elem/2`
   * [List] Add `List.ends_with?/2`
-  * [Macro] Improve `dbg` handling of `if/2` and of code blocks
+  * [Macro] Improve `dbg` handling of `if/2`, `with/1` and of code blocks
   * [Process] Handle arbitrarily high integer values in `Process.sleep/1`
   * [String] Inspect special whitespace and zero-width characters using their Unicode representation
 
diff --git a/lib/elixir/lib/macro.ex b/lib/elixir/lib/macro.ex
index 053a8fd9369..e037e57271a 100644
--- a/lib/elixir/lib/macro.ex
+++ b/lib/elixir/lib/macro.ex
@@ -2731,7 +2731,7 @@ defmodule Macro do
             end)
 
           error_clause =
-            quote do
+            quote generated: true do
               {other, _acc} -> raise WithClauseError, term: other
             end