From a6c54ebd9047c41aee3bd86c9fd215924326b2af Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Sat, 5 Jul 2014 14:14:23 -0600
Subject: [PATCH] Made Screen not go to next screen if the screen name is
 empty.

---
 src/Screen.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Screen.cpp b/src/Screen.cpp
index 7e4c0b4f84..3568fa0f9d 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -234,7 +234,17 @@ void Screen::HandleScreenMessage( const ScreenMessage SM )
 		if( SCREENMAN->IsStackedScreen(this) )
 			SCREENMAN->PopTopScreen( m_smSendOnPop );
 		else
-			SCREENMAN->SetNewScreen( SM == SM_GoToNextScreen? GetNextScreenName():GetPrevScreen() );
+		{
+			RString ToScreen= (SM == SM_GoToNextScreen? GetNextScreenName():GetPrevScreen());
+			if(ToScreen == "")
+			{
+				LuaHelpers::ReportScriptError("Error:  Tried to go to empty screen.");
+			}
+			else
+			{
+				SCREENMAN->SetNewScreen(ToScreen);
+			}
+		}
 	}
 	else if( SM == SM_GainFocus )
 	{