diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
index 16e2ee51f..4f85a9e50 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
@@ -148,14 +148,7 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
                 // Failed to connect
                 else {
                     logger.info("Connection from {} failed.", request.getRemoteAddr());
-
-                    try {
-                        // Send error to client
-                        response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                    }
-                    catch (IOException e) {
-                        throw new GuacamoleServerException(e);
-                    }
+                    throw new GuacamoleResourceNotFoundException("No tunnel created.");
                 }
 
             }