Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 914)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 916)
@@ -361,5 +361,8 @@
 		ImageIcon icon = ImageProvider.getIfAvailable(null, iconName);
 		if (icon == null)
+		{
+			System.out.println("Could not get presets icon " + iconName);
 			icon = new ImageIcon(iconName);
+		}
 		if (Math.max(icon.getIconHeight(), icon.getIconWidth()) != 16)
 			icon = new ImageIcon(icon.getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
Index: trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 914)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 916)
@@ -1,4 +1,6 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
@@ -33,5 +35,5 @@
 		String version = Main.pref.get("osm-server.version", "0.5");
 		urlStr = Main.pref.get("osm-server.url")+"/"+version+"/" + urlStr;
-		System.out.println("download: "+urlStr);
+//		System.out.println("download: "+urlStr);
 		initAuthentication();
 		URL url = new URL(urlStr);
@@ -45,8 +47,12 @@
 			activeConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
 
-		System.out.println("got return: "+activeConnection.getResponseCode());
 		activeConnection.setConnectTimeout(15000);
 		if (isAuthCancelled() && activeConnection.getResponseCode() == 401)
 			return null;
+		if( activeConnection.getResponseCode() == 500 )
+		{
+			throw new IOException(tr("Server returned internal error. Try a reduced area or retry after waiting some time."));
+		}
+//		System.out.println("got return: "+activeConnection.getResponseCode());
 
 		String encoding = activeConnection.getContentEncoding();