diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClientException.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClientException.java
new file mode 100644
index 000000000..d162344cb
--- /dev/null
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClientException.java
@@ -0,0 +1,79 @@
+
+package net.sourceforge.guacamole;
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is guacamole-common.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Jumper.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * A generic exception thrown when part of the Guacamole API encounters
+ * an error in the client's request. Such an error, if correctable, usually
+ * requires correction on the client side, not the server.
+ *
+ * @author Michael Jumper
+ */
+public class GuacamoleClientException extends GuacamoleException {
+
+    /**
+     * Creates a new GuacamoleException with the given message and cause.
+     *
+     * @param message A human readable description of the exception that
+     *                occurred.
+     * @param cause The cause of this exception.
+     */
+    public GuacamoleClientException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Creates a new GuacamoleException with the given message.
+     *
+     * @param message A human readable description of the exception that
+     *                occurred.
+     */
+    public GuacamoleClientException(String message) {
+        super(message);
+    }
+
+    /**
+     * Creates a new GuacamoleException with the given cause.
+     *
+     * @param cause The cause of this exception.
+     */
+    public GuacamoleClientException(Throwable cause) {
+        super(cause);
+    }
+
+}
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleResourceNotFoundException.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleResourceNotFoundException.java
index 0bedb3dc3..c6aec4a86 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleResourceNotFoundException.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleResourceNotFoundException.java
@@ -43,7 +43,7 @@ package net.sourceforge.guacamole;
  *
  * @author Michael Jumper
  */
-public class GuacamoleResourceNotFoundException extends GuacamoleException {
+public class GuacamoleResourceNotFoundException extends GuacamoleClientException {
 
     /**
      * Creates a new GuacamoleResourceNotFoundException with the given message
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleSecurityException.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleSecurityException.java
index bd4acd77e..f7cbe4c2e 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleSecurityException.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleSecurityException.java
@@ -43,7 +43,7 @@ package net.sourceforge.guacamole;
  *
  * @author Michael Jumper
  */
-public class GuacamoleSecurityException extends GuacamoleException {
+public class GuacamoleSecurityException extends GuacamoleClientException {
 
     /**
      * Creates a new GuacamoleSecurityException with the given message and cause.
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleInternalException.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleServerException.java
similarity index 91%
rename from guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleInternalException.java
rename to guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleServerException.java
index 691527fea..7d64f0099 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleInternalException.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleServerException.java
@@ -44,7 +44,7 @@ package net.sourceforge.guacamole;
  *
  * @author Michael Jumper
  */
-public class GuacamoleInternalException extends GuacamoleException {
+public class GuacamoleServerException extends GuacamoleException {
 
     /**
      * Creates a new GuacamoleException with the given message and cause.
@@ -53,7 +53,7 @@ public class GuacamoleInternalException extends GuacamoleException {
      *                occurred.
      * @param cause The cause of this exception.
      */
-    public GuacamoleInternalException(String message, Throwable cause) {
+    public GuacamoleServerException(String message, Throwable cause) {
         super(message, cause);
     }
 
@@ -63,7 +63,7 @@ public class GuacamoleInternalException extends GuacamoleException {
      * @param message A human readable description of the exception that
      *                occurred.
      */
-    public GuacamoleInternalException(String message) {
+    public GuacamoleServerException(String message) {
         super(message);
     }
 
@@ -72,7 +72,7 @@ public class GuacamoleInternalException extends GuacamoleException {
      *
      * @param cause The cause of this exception.
      */
-    public GuacamoleInternalException(Throwable cause) {
+    public GuacamoleServerException(Throwable cause) {
         super(cause);
     }