Index: src/org/openstreetmap/josm/gui/annotation/AnnotationCellRenderer.java
===================================================================
--- src/org/openstreetmap/josm/gui/annotation/AnnotationCellRenderer.java	(revision 176)
+++ src/org/openstreetmap/josm/gui/annotation/AnnotationCellRenderer.java	(revision 177)
@@ -16,5 +16,5 @@
 	@Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
         AnnotationPreset a = (AnnotationPreset)value;
-    	if (a.name == null)
+    	if (a == null || a.name == null)
         	return super.getListCellRendererComponent(list, "", index, false, false);
     	JComponent c = (JComponent)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
Index: src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 176)
+++ src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 177)
@@ -20,4 +20,5 @@
 import org.openstreetmap.josm.plugins.PluginProxy;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -36,6 +37,6 @@
 	// some common tabs
 	public final JPanel display = createPreferenceTab("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."));
-	public final JPanel connection = createPreferenceTab("connection", tr("Connection Settings"), tr("Connection Settings to the OSM server."));
-	public final JPanel map = createPreferenceTab("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."));
+	public final JPanel connection = createPreferenceTab("connection", I18n.tr("Connection Settings"), I18n.tr("Connection Settings to the OSM server."));
+	public final JPanel map = createPreferenceTab("map", I18n.tr("Map Settings"), I18n.tr("Settings for the map projection and data interpretation."));
 
 	/**