diff --git a/lobbyconnection.html b/lobbyconnection.html
index 79b0c9639..fb96c7106 100644
--- a/lobbyconnection.html
+++ b/lobbyconnection.html
@@ -43,7 +43,7 @@ <h1 class="title">Module <code>server.lobbyconnection</code></h1>
 
 import aiohttp
 from sqlalchemy import and_, func, select
-from sqlalchemy.exc import DBAPIError
+from sqlalchemy.exc import DBAPIError, OperationalError
 
 import server.metrics as metrics
 from server.db import FAFDatabase
@@ -245,6 +245,16 @@ <h1 class="title">Module <code>server.lobbyconnection</code></h1>
                 self.get_user_identifier(),
                 cmd
             )
+        except OperationalError:
+            # When the database goes down, SqlAlchemy will throw an OperationalError
+            self._logger.error(&#34;Encountered OperationalError on message received. This could indicate DB is down.&#34;)
+            await self.send({
+                &#34;command&#34;: &#34;notice&#34;,
+                &#34;style&#34;: &#34;error&#34;,
+                &#34;text&#34;: &#34;Unable to connect to database. Please try again later.&#34;
+            })
+            # Make sure to abort here to avoid a thundering herd problem.
+            await self.abort(&#34;Error connecting to database&#34;)
         except Exception as e:  # pragma: no cover
             await self.send({&#34;command&#34;: &#34;invalid&#34;})
             self._logger.exception(e)
@@ -1532,6 +1542,16 @@ <h2 class="section-title" id="header-classes">Classes</h2>
                 self.get_user_identifier(),
                 cmd
             )
+        except OperationalError:
+            # When the database goes down, SqlAlchemy will throw an OperationalError
+            self._logger.error(&#34;Encountered OperationalError on message received. This could indicate DB is down.&#34;)
+            await self.send({
+                &#34;command&#34;: &#34;notice&#34;,
+                &#34;style&#34;: &#34;error&#34;,
+                &#34;text&#34;: &#34;Unable to connect to database. Please try again later.&#34;
+            })
+            # Make sure to abort here to avoid a thundering herd problem.
+            await self.abort(&#34;Error connecting to database&#34;)
         except Exception as e:  # pragma: no cover
             await self.send({&#34;command&#34;: &#34;invalid&#34;})
             self._logger.exception(e)
@@ -3934,6 +3954,16 @@ <h3>Methods</h3>
             self.get_user_identifier(),
             cmd
         )
+    except OperationalError:
+        # When the database goes down, SqlAlchemy will throw an OperationalError
+        self._logger.error(&#34;Encountered OperationalError on message received. This could indicate DB is down.&#34;)
+        await self.send({
+            &#34;command&#34;: &#34;notice&#34;,
+            &#34;style&#34;: &#34;error&#34;,
+            &#34;text&#34;: &#34;Unable to connect to database. Please try again later.&#34;
+        })
+        # Make sure to abort here to avoid a thundering herd problem.
+        await self.abort(&#34;Error connecting to database&#34;)
     except Exception as e:  # pragma: no cover
         await self.send({&#34;command&#34;: &#34;invalid&#34;})
         self._logger.exception(e)