diff --git a/src/client_container.proto b/src/client_container.proto
index 03890479b..2943c8ac5 100644
--- a/src/client_container.proto
+++ b/src/client_container.proto
@@ -33,9 +33,12 @@ message ClientMessage {
         PEER_MESSAGE  = 302;
         TEST_CLIENT_MESSAGE = 303;
 
+        SERVER_BAD_STATE_RECOVERED = 900;
+
         SERVER_GENERIC_ERROR = 1000;
         SERVER_REJECTION_ERROR = 1001;
         SERVER_PERMISSION_ERROR = 1002;
+        SERVER_BAD_STATE_ERROR = 1003;
     }
 
     // Identifies which inner message is filled in
@@ -73,10 +76,14 @@ message ClientMessage {
     optional PeerMessage                peer_message = 302;
     optional TestClientMessage      test_client_message = 303;
 
+    // Server-to-Client special messages
+    optional ServerBadStateRecovered server_bad_state_recovered = 900;
+
     // Server-to-Client errors 
     optional ServerGenericError server_generic_error = 1000;
     optional ServerRejectionError server_rejection_error = 1001;
     optional ServerPermissionError server_permission_error = 1002;
+    optional ServerBadStateError server_bad_state_error = 1003;
 }
 
 // route_to: server
@@ -241,6 +248,14 @@ message SessionInvitation {
     optional string invitation = 1;
 }
 
+// route_to: client
+// this should follow a ServerBadStateError in the case that the 
+// websocket gateway recovers from whatever ailed it
+message ServerBadStateRecovered {
+}
+
+
+
 // route_to: client
 // this indicates unhandled error on server
 // if you receive this, your connection will close after.
@@ -263,3 +278,12 @@ message ServerRejectionError {
 message ServerPermissionError {
     optional string error_msg = 1;
 }
+
+// route_to: client
+// this indicates that the server is in a bad state, but could recover later, and is unable to process the request
+// your connection is not closed if this message occurs
+message ServerBadStateError {
+    optional string error_msg = 1;
+}
+
+