diff --git a/server.js b/server.js
index 61ae2ce0..cea96f17 100644
--- a/server.js
+++ b/server.js
@@ -1269,7 +1269,8 @@ app.get('/api/projects/suggestions', requireAuth, (req, res) => {
       const sessionDirName = path.basename(sessionWorkingDir).toLowerCase();
       const projectNameLower = project.name.toLowerCase();
 
-      if (sessionDirName.includes(projectNameLower) || projectNameLower.includes(sessionDirName)) {
+      if (sessionDirName && projectNameLower &&
+          (sessionDirName.includes(projectNameLower) || projectNameLower.includes(sessionDirName))) {
         score += 15;
         reasons.push('Similar name');
       }