diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/require_moderator.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/require_moderator.rs
index b25247a6df..d8dc232b37 100644
--- a/crates/service/web/storyteller_web/src/http_server/web_utils/require_moderator.rs
+++ b/crates/service/web/storyteller_web/src/http_server/web_utils/require_moderator.rs
@@ -54,12 +54,12 @@ pub async fn require_moderator(
 
       saved_connection = Some(connection);
 
-      saved_connection.as_mut().expect("this should be safe - we just saved the connection")
+      // NB: We just saved it, so it shouldn't error. Safer than unwrap/expect.
+      saved_connection.as_mut().ok_or(RequireModeratorError::ServerError)?
     },
     UseDatabase::FromPool(pool) => pool,
   };
 
-
   let maybe_user_session = server_state
       .session_checker
       .maybe_get_user_session_from_connection(&http_request, mysql_connection)