Index: /src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapView.java	(revision 214)
+++ /src/org/openstreetmap/josm/gui/MapView.java	(revision 215)
@@ -16,4 +16,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -73,5 +74,5 @@
 		addComponentListener(new ComponentAdapter(){
 			@Override public void componentResized(ComponentEvent e) {
-				recalculateCenterScale(null);
+				new AutoScaleAction("data").actionPerformed(null);
 				removeComponentListener(this);
 			}
Index: /src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- /src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 214)
+++ /src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 215)
@@ -75,5 +75,5 @@
 
 				// Try a relative file:// url, if the link is not in an URL-compatible form
-				if (relativePath != null && !URI.isWellFormedAddress(link))
+				if (relativePath != null && link != null && !URI.isWellFormedAddress(link))
 					link = new File(relativePath, link).toURI().toString();
 
Index: /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 214)
+++ /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 215)
@@ -21,4 +21,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.PluginException;
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.GBC;
@@ -36,7 +37,12 @@
 		if (pluginFiles != null) {
 			Arrays.sort(pluginFiles);
-			for (File f : pluginFiles)
-				if (f.isFile() && f.getName().endsWith(".jar"))
-					availablePlugins.add(new PluginInformation(f));
+			for (File f : pluginFiles) {
+				if (f.isFile() && f.getName().endsWith(".jar")) {
+					try {
+	                    availablePlugins.add(new PluginInformation(f));
+                    } catch (PluginException x) {
+                    }
+				}
+			}
 		}
 
Index: /src/org/openstreetmap/josm/io/RawGpsReader.java
===================================================================
--- /src/org/openstreetmap/josm/io/RawGpsReader.java	(revision 214)
+++ /src/org/openstreetmap/josm/io/RawGpsReader.java	(revision 215)
@@ -98,5 +98,7 @@
 				currentTagValues.clear();
 			} else if (qName.equals("wpt")) {
-				markerData.add(Marker.createMarker(currentLatLon, currentTagValues, relativeMarkerPath));
+				Marker m = Marker.createMarker(currentLatLon, currentTagValues, relativeMarkerPath);
+				if (m != null)
+					markerData.add(m);
 				currentTagValues.clear();
 			} else if (qName.equals("trkseg") || qName.equals("trk") || qName.equals("gpx")) {
Index: /src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- /src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 214)
+++ /src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 215)
@@ -54,4 +54,6 @@
 			JarInputStream jar = new JarInputStream(new FileInputStream(file));
 			Manifest manifest = jar.getManifest();
+			if (manifest == null)
+				throw new IOException(file+" contains no manifest.");
 			Attributes attr = manifest.getMainAttributes();
 			className = attr.getValue("Plugin-Class");
Index: /src/org/openstreetmap/josm/tools/XmlObjectParser.java
===================================================================
--- /src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 214)
+++ /src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 215)
@@ -115,5 +115,5 @@
 				}
 			} catch (Exception e) {
-				e.printStackTrace(); // !"§%$!"§ SAXException does not dump inner exceptions.
+				e.printStackTrace(); // SAXException does not dump inner exceptions.
 				throw new SAXException(e);
 			}