Index: trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java	(revision 7047)
+++ trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java	(revision 7048)
@@ -64,6 +64,6 @@
                 importers.add(importer);
                 MapView.addLayerChangeListener(importer);
-            } catch (Throwable t) {
-                Main.debug(t.getMessage());
+            } catch (Exception e) {
+                Main.debug(e.getMessage());
             }
         }
@@ -85,6 +85,6 @@
                 exporters.add(exporter);
                 MapView.addLayerChangeListener(exporter);
-            } catch (Throwable t) {
-                Main.debug(t.getMessage());
+            } catch (Exception e) {
+                Main.debug(e.getMessage());
             }
         }
Index: trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java	(revision 7047)
+++ trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java	(revision 7048)
@@ -174,8 +174,5 @@
             } catch (IOException e) {
                 handleException(tr("IO Error"), e);
-            } catch (RuntimeException e) {
-                cancel();
-                throw e;
-            } catch (Error e) {
+            } catch (Exception e) {
                 cancel();
                 throw e;
Index: trunk/src/org/openstreetmap/josm/data/projection/Projections.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Projections.java	(revision 7047)
+++ trunk/src/org/openstreetmap/josm/data/projection/Projections.java	(revision 7048)
@@ -179,6 +179,6 @@
             try {
                 proj = pc.getProjection();
-            } catch (Throwable t) {
-                String cause = t.getMessage();
+            } catch (Exception e) {
+                String cause = e.getMessage();
                 Main.warn("Unable to get projection "+code+" with "+pc + (cause != null ? ". "+cause : ""));
             }
Index: trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java	(revision 7047)
+++ trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java	(revision 7048)
@@ -64,6 +64,6 @@
                 try {
                     instance.initFromOAuth(Main.parent);
-                } catch (Throwable t) {
-                    Main.error(t);
+                } catch (Exception e) {
+                    Main.error(e);
                     // Fall back to preferences if OAuth identification fails for any reason
                     instance.initFromPreferences();
@@ -278,6 +278,6 @@
                 try {
                     instance.initFromOAuth(Main.parent);
-                } catch (Throwable t) {
-                    Main.error(t);
+                } catch (Exception e) {
+                    Main.error(e);
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 7047)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 7048)
@@ -562,5 +562,5 @@
                                 } catch (SecurityException ex) {
                                     Main.error(ex);
-                                } catch (Throwable ex) {
+                                } catch (Exception ex) {
                                     BugReportExceptionHandler.handleException(ex);
                                 } finally {
@@ -576,5 +576,5 @@
                 } catch (SecurityException ex) {
                     Main.error(ex);
-                } catch (Throwable ex) {
+                } catch (Exception ex) {
                     // allow to change most settings even if e.g. a plugin fails
                     BugReportExceptionHandler.handleException(ex);
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 7047)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 7048)
@@ -571,5 +571,5 @@
                         + "Delete from preferences?</html>", plugin.name, plugin.className);
             }
-        }  catch (Throwable e) {
+        }  catch (Exception e) {
             Main.error(e);
         }