diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 863c94b1f..d45f706f2 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -479,9 +479,7 @@ public class Dispatcher {
                     l.dispatcherInitialized(this);
                 }
             }
-            //if (servletContext != null) {
-                errorHandler.init(servletContext);
-            //}
+            errorHandler.init(servletContext);
 
         } catch (Exception ex) {
             if (LOG.isErrorEnabled())