diff --git a/guacamole-common-js/src/main/webapp/modules/Status.js b/guacamole-common-js/src/main/webapp/modules/Status.js
index 76a796b28..855d73d45 100644
--- a/guacamole-common-js/src/main/webapp/modules/Status.js
+++ b/guacamole-common-js/src/main/webapp/modules/Status.js
@@ -100,21 +100,21 @@ Guacamole.Status.Code = {
      */
     "SERVER_BUSY": 0x0201,
 
-    /**
-     * The operation could not be performed because the upstream server is not
-     * responding.
-     *
-     * @type Number
-     */
-    "UPSTREAM_ERROR": 0x0202,
-
     /**
      * The operation was unsuccessful due to an error or otherwise unexpected
      * condition of the upstream server.
      *
      * @type Number
      */
-    "UPSTREAM_TIMEOUT": 0x0203,
+    "UPSTREAM_TIMEOUT": 0x0202,
+
+    /**
+     * The operation could not be performed because the upstream server is not
+     * responding.
+     *
+     * @type Number
+     */
+    "UPSTREAM_ERROR": 0x0203,
 
     /**
      * The operation could not be performed as the requested resource does not
diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index b45247928..45a9f1f14 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -72,14 +72,14 @@ GuacUI.Client = {
                  because there are too many active connections. Please wait \
                  a few minutes and try again.",
 
-        0x0202: "The remote desktop server encountered an error and has closed \
-                 the connection. Please try again or contact your system       \
-                 administrator.",
-
-        0x0203: "The Guacamole server has closed the connection because the \
+        0x0202: "The Guacamole server has closed the connection because the \
                  remote desktop is taking too long to respond. Please try   \
                  again or contact your system administrator.",
 
+        0x0203: "The remote desktop server encountered an error and has closed \
+                 the connection. Please try again or contact your system       \
+                 administrator.",
+
         0x0204: "The requested connection does not exist. Please check the \
                  connection name and try again.",
 
@@ -124,14 +124,14 @@ GuacUI.Client = {
         0x0201: "Too many files are currently being transferred. Please wait \
                  for existing transfers to complete, and then try again.",
 
-        0x0202: "The remote desktop server encountered an error during \
-                 transfer. Please try again or contact your system     \
-                 administrator.",
-
-        0x0203: "The file cannot be transferred because the remote desktop \
+        0x0202: "The file cannot be transferred because the remote desktop \
                  server is taking too long to respond. Please try again or \
                  or contact your system administrator.",
 
+        0x0203: "The remote desktop server encountered an error during \
+                 transfer. Please try again or contact your system     \
+                 administrator.",
+
         0x0204: "The destination for the file transfer does not exist. Please \
                  check that the destionation exists and try again.",