diff --git a/playwright/_impl/_connection.py b/playwright/_impl/_connection.py
index 027daf69d..2d1dad933 100644
--- a/playwright/_impl/_connection.py
+++ b/playwright/_impl/_connection.py
@@ -362,12 +362,7 @@ def _send_message_to_server(
             "params": self._replace_channels_with_guids(params),
             "metadata": metadata,
         }
-        if (
-            self._tracing_count > 0
-            and frames
-            and frames
-            and object._guid != "localUtils"
-        ):
+        if self._tracing_count > 0 and frames and object._guid != "localUtils":
             self.local_utils.add_stack_to_tracing_no_reply(id, frames)
 
         self._transport.send(message)
@@ -519,7 +514,10 @@ async def wrap_api_call(
         if self._api_zone.get():
             return await cb()
         task = asyncio.current_task(self._loop)
-        st: List[inspect.FrameInfo] = getattr(task, "__pw_stack__", inspect.stack())
+        st: List[inspect.FrameInfo] = getattr(
+            task, "__pw_stack__", None
+        ) or inspect.stack(0)
+
         parsed_st = _extract_stack_trace_information_from_stack(st, is_internal)
         self._api_zone.set(parsed_st)
         try:
@@ -535,7 +533,9 @@ def wrap_api_call_sync(
         if self._api_zone.get():
             return cb()
         task = asyncio.current_task(self._loop)
-        st: List[inspect.FrameInfo] = getattr(task, "__pw_stack__", inspect.stack())
+        st: List[inspect.FrameInfo] = getattr(
+            task, "__pw_stack__", None
+        ) or inspect.stack(0)
         parsed_st = _extract_stack_trace_information_from_stack(st, is_internal)
         self._api_zone.set(parsed_st)
         try:
diff --git a/tests/async/test_asyncio.py b/tests/async/test_asyncio.py
index 33edc71ce..971c65473 100644
--- a/tests/async/test_asyncio.py
+++ b/tests/async/test_asyncio.py
@@ -87,3 +87,15 @@ async def raise_exception() -> None:
     assert "Something went wrong" in str(exc_info.value.exceptions[0])
     assert isinstance(exc_info.value.exceptions[0], ValueError)
     assert await page.evaluate("() => 11 * 11") == 121
+
+
+async def test_should_return_proper_api_name_on_error(page: Page) -> None:
+    try:
+        await page.evaluate("does_not_exist")
+
+        assert (
+            False
+        ), "Accessing undefined JavaScript variable should have thrown exception"
+    except Exception as error:
+        # Each browser returns slightly different error messages, but they should all start with "Page.evaluate:", because that was the Playwright method where the error originated
+        assert str(error).startswith("Page.evaluate:")
diff --git a/tests/sync/test_sync.py b/tests/sync/test_sync.py
index 64eace1e9..92d40c19a 100644
--- a/tests/sync/test_sync.py
+++ b/tests/sync/test_sync.py
@@ -346,3 +346,15 @@ def test_call_sync_method_after_playwright_close_with_own_loop(
     p.start()
     p.join()
     assert p.exitcode == 0
+
+
+def test_should_return_proper_api_name_on_error(page: Page) -> None:
+    try:
+        page.evaluate("does_not_exist")
+
+        assert (
+            False
+        ), "Accessing undefined JavaScript variable should have thrown exception"
+    except Exception as error:
+        # Each browser returns slightly different error messages, but they should all start with "Page.evaluate:", because that was the Playwright method where the error originated
+        assert str(error).startswith("Page.evaluate:")