Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 11556)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 11557)
@@ -407,12 +407,12 @@
 
                         EventQueue.invokeAndWait(new CollectorWorker(ms));
-                    } catch (InterruptedException e) {
-                        // Occurs frequently during JOSM shutdown, log set to trace only
-                        Main.trace("InterruptedException in "+MapStatus.class.getSimpleName());
-                        Thread.currentThread().interrupt();
                     } catch (InvocationTargetException e) {
                         Main.warn(e);
                     }
                 }
+            } catch (InterruptedException e) {
+                // Occurs frequently during JOSM shutdown, log set to trace only
+                Main.trace("InterruptedException in "+MapStatus.class.getSimpleName());
+                Thread.currentThread().interrupt();
             } finally {
                 unregisterListeners();