From 40374984ed20eb3b384d608bdaf8dbbe09b3ff1d Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Wed, 17 Aug 2022 09:20:31 +0100
Subject: [PATCH] test

---
 src/textual/app.py    | 5 ++++-
 tests/test_screens.py | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/textual/app.py b/src/textual/app.py
index 80d12510c..fe288a2a5 100644
--- a/src/textual/app.py
+++ b/src/textual/app.py
@@ -418,7 +418,10 @@ class App(Generic[ReturnType], DOMNode):
 
     @property
     def screen(self) -> Screen:
-        return self._screen_stack[-1]
+        try:
+            return self._screen_stack[-1]
+        except IndexError:
+            raise ScreenStackError("No screens on stack") from None
 
     @property
     def size(self) -> Size:
diff --git a/tests/test_screens.py b/tests/test_screens.py
index 959b27da3..7ab342ad4 100644
--- a/tests/test_screens.py
+++ b/tests/test_screens.py
@@ -10,6 +10,9 @@ async def test_screens():
     app = App()
     app._set_active()
 
+    with pytest.raises(ScreenStackError):
+        app.screen
+
     assert not app._installed_screens
 
     screen1 = Screen(name="screen1")