diff --git a/src/App.tsx b/src/App.tsx
index 08d54d0..1bc1ff5 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -24,7 +24,7 @@ function App() {
   const [celebrationMessage, setCelebrationMessage] = useState<string | null>(null);
   const [previousMilestones, setPreviousMilestones] = useState<Record<string, boolean>>({});
   const [mascotEntities, setMascotEntities] = useState<ClickableMascotType[]>([]);
-  const timeoutRef = useRef<number | null>(null);
+  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const gameStateRef = useRef(gameState); // Ref to hold the latest gameState
   
   const [location] = useLocation(); // Get current location from wouter
@@ -283,7 +283,13 @@ function App() {
       {/* News Marquee */}
       {(() => {
         const newsUpgrade = UPGRADES.find(u => u.id === 'news');
-        if (userState?.upgrades['news']?.owned > 0 && newsUpgrade?.newsTitles) {
+        if (
+          userState &&
+          userState.upgrades &&
+          userState.upgrades['news'] &&
+          userState.upgrades['news'].owned > 0 &&
+          newsUpgrade?.newsTitles
+        ) {
           return <NewsMarquee titles={(newsUpgrade as Upgrade).newsTitles!} />;
         }
         return null;