diff --git a/BP.AdventureFramework/Logic/Game.cs b/BP.AdventureFramework/Logic/Game.cs
index bd04fde2..1406b9d7 100644
--- a/BP.AdventureFramework/Logic/Game.cs
+++ b/BP.AdventureFramework/Logic/Game.cs
@@ -238,8 +238,8 @@ private void Execute()
             do
             {
                 var displayReactionToInput = true;
-                var endCheckResult = CompletionCondition(this);
-                var gameOverCheckResult = GameOverCondition(this);
+                var endCheckResult = CompletionCondition(this) ?? EndCheckResult.NotEnded;
+                var gameOverCheckResult = GameOverCondition(this) ?? EndCheckResult.NotEnded;
 
                 if (endCheckResult.HasEnded)
                 {
@@ -259,8 +259,8 @@ private void Execute()
                 if (!CurrentFrame.AcceptsInput)
                 {
                     var frame = CurrentFrame;
-
-                    while (!WaitForKeyPressCallback(Convert.ToChar(13)) && CurrentFrame == frame)
+                    
+                    while (!WaitForKeyPressCallback(StringUtilities.CR) && CurrentFrame == frame)
                         DrawFrame(CurrentFrame);
                 }
                 else