diff --git a/pom.xml b/pom.xml
index 6288fcae9..635b2cab1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,9 +141,7 @@
 						<exclude>org/codelibs/fess/app/web/admin/FileAuthenticationForm.java</exclude>
 						<exclude>org/codelibs/fess/app/web/admin/RequestHeaderAction.java</exclude>
 						<exclude>org/codelibs/fess/app/web/base/AbstractLoginAction.java</exclude>
-						<exclude>org/codelibs/fess/app/web/ErrorAction.java</exclude>
 						<exclude>org/codelibs/fess/app/web/LoginAction.java</exclude>
-						<exclude>org/codelibs/fess/app/web/ErrorForm.java</exclude>
 						<exclude>org/codelibs/fess/app/web/LoginForm.java</exclude>
 					</excludes>
 				</configuration>
diff --git a/src/main/java/org/codelibs/fess/app/web/ErrorAction.java b/src/main/java/org/codelibs/fess/app/web/ErrorAction.java
deleted file mode 100644
index 4acb3f4a4..000000000
--- a/src/main/java/org/codelibs/fess/app/web/ErrorAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.app.web;
-
-import javax.annotation.Resource;
-
-public class ErrorAction {
-
-    //@ActionForm
-    @Resource
-    protected ErrorForm errorForm;
-
-    //@Execute(validator = false)
-    public String index() {
-        return "notFound.jsp";
-    }
-
-    //@Execute(validator = false)
-    public String systemError() {
-        return "system.jsp";
-    }
-
-    //@Execute(validator = false)
-    public String badRequest() {
-        return "badRequest.jsp";
-    }
-
-    //@Execute(validator = false)
-    public String notFound() {
-        return "notFound.jsp";
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java b/src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java
new file mode 100644
index 000000000..afb328bce
--- /dev/null
+++ b/src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009-2015 the CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+package org.codelibs.fess.app.web.error;
+
+import org.codelibs.fess.app.web.base.FessSearchAction;
+import org.lastaflute.web.Execute;
+import org.lastaflute.web.response.HtmlResponse;
+
+public class ErrorAction extends FessSearchAction {
+
+    // ===================================================================================
+    //                                                                            Constant
+    //     
+
+    // ===================================================================================
+    //                                                                           Attribute
+    //     
+
+    // ===================================================================================
+    //                                                                      Search Execute
+    //                                                                      ==============
+    @Execute
+    public HtmlResponse index(final ErrorForm form) {
+        return asHtml(path_Error_NotFoundJsp);
+    }
+
+    @Execute
+    public HtmlResponse systemError(final ErrorForm form) {
+        return asHtml(path_Error_SystemJsp);
+    }
+
+    @Execute
+    public HtmlResponse badRequest(final ErrorForm form) {
+        return asHtml(path_Error_BadRequestJsp);
+    }
+
+    @Execute
+    public HtmlResponse notFound(final ErrorForm form) {
+        return asHtml(path_Error_NotFoundJsp);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/codelibs/fess/app/web/ErrorForm.java b/src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java
similarity index 94%
rename from src/main/java/org/codelibs/fess/app/web/ErrorForm.java
rename to src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java
index 29b6c556b..a519b9e2e 100644
--- a/src/main/java/org/codelibs/fess/app/web/ErrorForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java
@@ -14,7 +14,7 @@
  * governing permissions and limitations under the License.
  */
 
-package org.codelibs.fess.app.web;
+package org.codelibs.fess.app.web.error;
 
 import java.io.Serializable;
 
@@ -23,4 +23,5 @@ public class ErrorForm implements Serializable {
     private static final long serialVersionUID = 1L;
 
     public String url;
+
 }