Fix FELIX-4693

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1639578 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/handler/whiteboard/whiteboard-handler/src/main/java/org/apache/felix/ipojo/handler/wbp/WhiteBoardManager.java b/ipojo/handler/whiteboard/whiteboard-handler/src/main/java/org/apache/felix/ipojo/handler/wbp/WhiteBoardManager.java
index d5077a2..8e0da46 100644
--- a/ipojo/handler/whiteboard/whiteboard-handler/src/main/java/org/apache/felix/ipojo/handler/wbp/WhiteBoardManager.java
+++ b/ipojo/handler/whiteboard/whiteboard-handler/src/main/java/org/apache/felix/ipojo/handler/wbp/WhiteBoardManager.java
@@ -114,8 +114,8 @@
             m_handler.error("The onArrival method " + m_onArrival.getMethod() + " cannot be invoked", e);
             m_handler.getInstanceManager().stop();
         } catch (InvocationTargetException e) {
-            m_handler.error("The onArrival method " + m_onArrival.getMethod() + " has thrown an exception", e.getTargetException());
-            m_handler.getInstanceManager().stop();
+            m_handler.error("The onArrival method " + m_onArrival.getMethod() + " has thrown an exception", e
+                    .getTargetException());
         }
     }
 
@@ -147,7 +147,6 @@
                 m_handler.getInstanceManager().stop();
             } catch (InvocationTargetException e) {
                 m_handler.error("The onModification method " + m_onModification.getMethod() + " has thrown an exception", e.getTargetException());
-                m_handler.getInstanceManager().stop();
             }
         }
     }
@@ -169,7 +168,6 @@
             m_handler.getInstanceManager().stop();
         } catch (InvocationTargetException e) {
             m_handler.error("The onDeparture method " + m_onDeparture.getMethod() + " has thrown an exception", e.getTargetException());
-            m_handler.getInstanceManager().stop();
         }
     }