diff --git a/__jet.cpp b/__jet.cpp
index dac1e6a..cb6ee12 100644
--- a/__jet.cpp
+++ b/__jet.cpp
@@ -24,6 +24,20 @@ namespace jet {
 //	      follow sessiontimeoutredirecturl.
 	    } else {
 	       SessionId sessionId;
+	       // A 160-bit CSPRNG value colliding with an existing session file
+	       // is astronomically unlikely, but cheap to guard against outright
+	       // rather than trust the probability - regenerate on an actual
+	       // collision instead of ever reusing another session's file.
+	       int sessionIdAttempts = 0;
+	       while(true) {
+	          coreutils::MString candidatePath;
+	          candidatePath << resolveKeyword("sessiondir") << "/" << sessionId << ".json";
+	          if(access(candidatePath.c_str(), F_OK) != 0)
+	             break;
+	          if(++sessionIdAttempts >= 5)
+	             throw coreutils::Exception("could not generate a unique session id after multiple attempts.");
+	          sessionId = SessionId();
+	       }
 	       global.headers["Set-Cookie"] << "session=" << sessionId;
 	       global.cookies.data["session"] = sessionId;
 	       sessionIdValue = sessionId;