diff --git a/server/src/adminApi.ts b/server/src/adminApi.ts
index 8553b8b..0466278 100644
--- a/server/src/adminApi.ts
+++ b/server/src/adminApi.ts
@@ -1014,7 +1014,7 @@ adminRouter.post("/admin/namemanager/import", async (req: Request, res: Response
     console.error('[AdminAPI] Error importing nameManager state:', error);
     
     // Handle specific error types
-    if (error.message && error.message.includes('PayloadTooLargeError')) {
+    if (error instanceof Error && error.message && error.message.includes('PayloadTooLargeError')) {
       return res.status(413).json({ 
         error: 'File too large', 
         details: 'The save file is too large to process. Maximum size: 50MB' 
@@ -1023,7 +1023,7 @@ adminRouter.post("/admin/namemanager/import", async (req: Request, res: Response
     
     res.status(500).json({ 
       error: 'Failed to import nameManager state', 
-      details: error.message 
+      details: error instanceof Error ? error.message : 'Unknown error'
     });
   }
 });
diff --git a/server/src/rooms/GameRoom.ts b/server/src/rooms/GameRoom.ts
index a31a8c7..fc34cec 100644
--- a/server/src/rooms/GameRoom.ts
+++ b/server/src/rooms/GameRoom.ts
@@ -136,8 +136,7 @@ export class GameRoom extends Room<GameState> {
       
       // Update metadata with new status
       const statusString = this.state.gameStatus === GameStatus.WAITING ? 'waiting' : 
-                          (this.state.gameStatus === GameStatus.PAUSED ? 'paused' : 
-                          (this.state.gameStatus === GameStatus.FINISHED ? 'finished' : 'playing'));
+                          (this.state.gameStatus === GameStatus.PAUSED ? 'paused' : 'playing');
       
       this.setMetadata({ 
         gameStatus: statusString,