Index: java/org/apache/catalina/core/StandardWrapper.java
===================================================================
--- java/org/apache/catalina/core/StandardWrapper.java  (revision 1028167)
+++ java/org/apache/catalina/core/StandardWrapper.java  (working copy)
@@ -53,6 +53,7 @@
 import org.apache.catalina.InstanceEvent;
 import org.apache.catalina.InstanceListener;
 import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.mbeans.MBeanUtils;
 import org.apache.catalina.security.SecurityUtil;
@@ -737,7 +738,8 @@
         synchronized (mappings) {
             mappings.add(mapping);
         }
-        fireContainerEvent(ADD_MAPPING_EVENT, mapping);
+        if(parent.getState().equals(LifecycleState.STARTED))
+            fireContainerEvent(ADD_MAPPING_EVENT, mapping);
 
     }
 
@@ -1198,7 +1200,8 @@
         synchronized (mappings) {
             mappings.remove(mapping);
         }
-        fireContainerEvent(REMOVE_MAPPING_EVENT, mapping);
+        if(parent.getState().equals(LifecycleState.STARTED))
+            fireContainerEvent(REMOVE_MAPPING_EVENT, mapping);
 
     }
 
Index: java/org/apache/catalina/core/StandardContext.java
===================================================================
--- java/org/apache/catalina/core/StandardContext.java  (revision 1028167)
+++ java/org/apache/catalina/core/StandardContext.java  (working copy)
@@ -2971,8 +2971,8 @@
             welcomeFiles = results;
         }
         postWelcomeFiles();
-        fireContainerEvent(ADD_WELCOME_FILE_EVENT, name);
-
+        if(this.getState().equals(LifecycleState.STARTED))
+            fireContainerEvent(ADD_WELCOME_FILE_EVENT, name);
     }
 
 
@@ -4072,7 +4072,8 @@
 
         // Inform interested listeners
         postWelcomeFiles();
-        fireContainerEvent(REMOVE_WELCOME_FILE_EVENT, name);
+        if(this.getState().equals(LifecycleState.STARTED))
+            fireContainerEvent(REMOVE_WELCOME_FILE_EVENT, name);
 
     }