diff --git a/skyvern/exceptions.py b/skyvern/exceptions.py
index bc22ea7d..4d14f7b1 100644
--- a/skyvern/exceptions.py
+++ b/skyvern/exceptions.py
@@ -266,11 +266,6 @@ class UnknownErrorWhileCreatingBrowserContext(SkyvernException):
         )
 
 
-class BrowserStateMissingPage(SkyvernException):
-    def __init__(self) -> None:
-        super().__init__("BrowserState is missing the main page")
-
-
 class OrganizationNotFound(SkyvernHTTPException):
     def __init__(self, organization_id: str) -> None:
         super().__init__(
diff --git a/skyvern/forge/agent.py b/skyvern/forge/agent.py
index e78d22ce..3f963102 100644
--- a/skyvern/forge/agent.py
+++ b/skyvern/forge/agent.py
@@ -38,7 +38,6 @@ from skyvern.errors.errors import (
 )
 from skyvern.exceptions import (
     BrowserSessionNotFound,
-    BrowserStateMissingPage,
     DownloadFileMaxWaitingTime,
     EmptyScrapePage,
     FailedToGetTOTPVerificationCode,
@@ -829,6 +828,21 @@ class ForgeAgent:
                 browser_session_id=browser_session_id,
             )
             return step, detailed_output, None
+        except MissingBrowserStatePage:
+            LOG.warning("Missing browser state page, marking the task as failed")
+            await self.fail_task(
+                task,
+                step,
+                "The browser does not have a valid page for skyvern to operate. This may be due to the website being empty or the browser crashing.",
+            )
+            await self.clean_up_task(
+                task=task,
+                last_step=step,
+                api_key=api_key,
+                close_browser_on_completion=close_browser_on_completion,
+                browser_session_id=browser_session_id,
+            )
+            return step, detailed_output, None
         except Exception as e:
             LOG.exception("Got an unexpected exception in step, marking task as failed")
 
@@ -1450,6 +1464,7 @@ class ForgeAgent:
             UnsupportedTaskType,
             FailedToParseActionInstruction,
             ScrapingFailed,
+            MissingBrowserStatePage,
         ):
             raise
 
@@ -2178,7 +2193,7 @@ class ForgeAgent:
     ) -> None:
         working_page = await browser_state.get_working_page()
         if not working_page:
-            raise BrowserStateMissingPage()
+            raise MissingBrowserStatePage()
 
         context = skyvern_context.ensure_context()
         scrolling_number = context.max_screenshot_scrolls
diff --git a/skyvern/webeye/browser_factory.py b/skyvern/webeye/browser_factory.py
index 529f4af3..c84985aa 100644
--- a/skyvern/webeye/browser_factory.py
+++ b/skyvern/webeye/browser_factory.py
@@ -804,7 +804,8 @@ class BrowserState:
 
     async def must_get_working_page(self) -> Page:
         page = await self.get_working_page()
-        assert page is not None
+        if page is None:
+            raise MissingBrowserStatePage()
         return page
 
     async def set_working_page(self, page: Page | None, index: int = 0) -> None: