diff --git a/pyp.py b/pyp.py
index ae2b408..0bd5f01 100644
--- a/pyp.py
+++ b/pyp.py
@@ -479,7 +479,7 @@ def build(self) -> ast.Module:
 
         ret = ast.parse("")
         ret.body = self.before_tree.body + self.tree.body + self.after_tree.body
-        # Add line numbers to the nodes, so we can be more helpful on error
+        # Add fake line numbers to the nodes, so we can generate a traceback on error
         i = 0
         for node in dfs_walk(ret):
             if isinstance(node, ast.stmt):
@@ -520,21 +520,30 @@ def run_pyp(args: argparse.Namespace) -> None:
         print(unparse(tree))
     else:
         try:
-            exec(compile(tree, filename="<ast>", mode="exec"), {})
+            exec(compile(tree, filename="<pyp>", mode="exec"), {})
         except Exception as e:
-            message = (
-                "Code raised the following exception, consider using --explain to investigate:\n\n"
-                + "".join(traceback.format_exception_only(type(e), e)).strip()
-            )
             try:
-                lineno = e.__traceback__.tb_next.tb_lineno  # type: ignore
-                code = unparse(
-                    next(n for n in dfs_walk(tree) if getattr(n, "lineno", -1) == lineno), True
-                ).strip()
-                message += f"\n\nPossibly at:\n{code}"
+                line_to_node: Dict[int, ast.AST] = {}
+                for node in dfs_walk(tree):
+                    line_to_node.setdefault(getattr(node, "lineno", -1), node)
+                # Time to commit several sins against CPython implementation details
+                tb_except = traceback.TracebackException(
+                    type(e), e, e.__traceback__.tb_next  # type: ignore
+                )
+                tb_except.exc_traceback = None  # type: ignore
+                for fs in tb_except.stack:
+                    if fs.filename == "<pyp>":
+                        fs._line = unparse(line_to_node[fs.lineno]).strip()  # type: ignore
+                        fs.lineno = "PYP_REDACTED"  # type: ignore
+                message = "Possible reconstructed traceback (most recent call last):\n"
+                message += "".join(tb_except.format()).strip("\n")
+                message = message.replace(", line PYP_REDACTED", "")
             except Exception:
-                pass
-            raise PypError(message) from e
+                message = "".join(traceback.format_exception_only(type(e), e)).strip()
+            raise PypError(
+                "Code raised the following exception, consider using --explain to investigate:\n\n"
+                f"{message}"
+            ) from e
 
 
 def parse_options(args: List[str]) -> argparse.Namespace:
diff --git a/tests/test_pyp.py b/tests/test_pyp.py
index 3156711..767c279 100644
--- a/tests/test_pyp.py
+++ b/tests/test_pyp.py
@@ -154,21 +154,24 @@ def test_user_error():
     with pytest.raises(pyp.PypError, match="Invalid input"):
         run_pyp("pyp 'x +'")
 
-    pattern = re.compile("Code raised.*ZeroDivisionError.*Possibly.*1 / 0", re.DOTALL)
+    pattern = re.compile("Code raised.*Possible.*1 / 0.*ZeroDivisionError", re.DOTALL)
     with pytest.raises(pyp.PypError, match=pattern):
         run_pyp("pyp '1 / 0'")
 
-    pattern = re.compile("Code raised.*ModuleNotFoundError.*lol.*Possibly.*import lol", re.DOTALL)
+    pattern = re.compile("Code raised.*Possible.*import lol.*ModuleNotFoundError", re.DOTALL)
     with pytest.raises(pyp.PypError, match=pattern):
         run_pyp("pyp 'lol'")
 
+    pyp_error = run_cmd("pyp 'def f(): 1/0' 'f()'", check=False)
     message = lambda x, y: (  # noqa
         "error: Code raised the following exception, consider using --explain to investigate:\n\n"
-        "ZeroDivisionError: division by zero\n\n"
-        "Possibly at:\n"
-        f"output = {x}int(x) / 0{y}\n"
+        "Possible reconstructed traceback (most recent call last):\n"
+        '  File "<pyp>", in <module>\n'
+        "    output = f()\n"
+        '  File "<pyp>", in f\n'
+        f"    {x}1 / 0{y}\n"
+        "ZeroDivisionError: division by zero\n"
     )
-    pyp_error = run_cmd("pyp 'int(x) / 0'", input="1", check=False)
     assert pyp_error == message("(", ")") or pyp_error == message("", "")