diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
index 7ccfc316617..a384f064794 100644
--- a/client/WEB-INF/web.xml
+++ b/client/WEB-INF/web.xml
@@ -77,4 +77,10 @@
         <url-pattern>*.html</url-pattern>
         <url-pattern>*.js</url-pattern>
     </servlet-mapping>
+
+    <error-page>
+      <exception-type>java.lang.Exception</exception-type>
+      <location>/error.jsp</location>
+    </error-page>
+
 </web-app>
diff --git a/ui/error.jsp b/ui/error.jsp
new file mode 100644
index 00000000000..88fdfa1043e
--- /dev/null
+++ b/ui/error.jsp
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Apache CloudStack</title>
+        <link rel="shortcut icon" href="images/cloud.ico" />
+    </head>
+    <body>
+        <p>Oops, looks like CloudStack hit an error. Ask your CloudStack Administrator to look into it.</p>
+    </body>
+</html>
