diff --git a/client/src/components/app_bar.tsx b/client/src/components/app_bar.tsx
index 242b65e..c45b0b0 100644
--- a/client/src/components/app_bar.tsx
+++ b/client/src/components/app_bar.tsx
@@ -89,7 +89,7 @@ export function WelcomeAppBar({gameInfo, toggleImpressum, openEraseMenu, openUpl
       </div>
       <div>
         <span className="app-bar-title">
-          {gameInfo.title}
+          {gameInfo?.title}
         </span>
       </div>
       <div className="nav-btns">
diff --git a/client/src/components/welcome.tsx b/client/src/components/welcome.tsx
index acc3202..36c6f29 100644
--- a/client/src/components/welcome.tsx
+++ b/client/src/components/welcome.tsx
@@ -31,7 +31,7 @@ function IntroductionPanel({introduction}: {introduction: string}) {
   // then this can be simplified.
 
   // let text: Array<string> = introduction.split(/\n(\s*\n)+/)
-  let text: Array<string> = [introduction]
+  let text: Array<string> = introduction ? [introduction] : []
 
   return <div className="column chat-panel">
     <div className="chat">