Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 6385)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 6386)
@@ -88,25 +88,17 @@
             Layer.listeners.remove(this); 
         
-        // Add/Remove the upload hook
-        try
-        {
-            LinkedList<UploadHook> hooks = ((UploadAction)Main.main.menu.upload).uploadHooks;
-            Iterator<UploadHook> hooksIt = hooks.iterator(); 
-            while( hooksIt.hasNext() )
-            {
-                if( hooksIt.next() instanceof ValidateUploadHook )
-                {
-                    if( newFrame == null )
-                        hooksIt.remove();
-                    break;
-                }
-            }
-            if( newFrame != null )
-                hooks.add( 0, new ValidateUploadHook() );
-        }
-        catch(Throwable t)
-        {
-            // JOSM has no upload hooks in older versions 
-        }        
+		LinkedList<UploadHook> hooks = ((UploadAction)Main.main.menu.upload).uploadHooks;
+		Iterator<UploadHook> hooksIt = hooks.iterator(); 
+		while( hooksIt.hasNext() )
+		{
+			if( hooksIt.next() instanceof ValidateUploadHook )
+			{
+				if( newFrame == null )
+					hooksIt.remove();
+				break;
+			}
+		}
+		if( newFrame != null )
+			hooks.add( 0, new ValidateUploadHook() );
 	}