diff --git a/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java b/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java
index 008b47650e..12fe1e3337 100644
--- a/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java
+++ b/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java
@@ -490,7 +490,11 @@ public void stop(BundleContext context) throws Exception {
         this.isAlive = false;
         try {
             //stop the running shells
-            AbstractShell.shutdownAllShells();
+            try {
+                AbstractShell.shutdownAllShells();
+            } catch (Exception e) {
+                Log.log(e);
+            }
 
             //save the natures (code completion stuff) -- and only the ones initialized
             //(no point in getting the ones not initialized)