diff --git a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
index f0a81d1f0..44d40e3ad 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
@@ -70,12 +70,14 @@ public class GuacamoleException extends Exception {
     }
 
     /**
-     * Returns the numeric HTTP status code associated with this exception.
+     * Returns the most applicable HTTP status code that can be associated
+     * with this exception.
      *
      * @return
-     *     The numeric HTTP status code associated with this exception.
+     *     An integer representing the most applicable HTTP status code
+     *     associated with this exception.
      */
-    public Integer getHttpStatusCode() {
+    public int getHttpStatusCode() {
         return getStatus().getHttpStatusCode();
     }