Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java	(revision 2773)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java	(revision 2775)
@@ -106,6 +106,11 @@
         try {
             PasswordAuthentication pa = cm.lookup(RequestorType.SERVER);
-            tfOsmUserName.setText(pa.getUserName() == null? "" : pa.getUserName());
-            tfOsmPassword.setText(pa.getPassword() == null ? "" : String.valueOf(pa.getPassword()));
+            if (pa == null) {
+                tfOsmUserName.setText("");
+                tfOsmPassword.setText("");
+            } else {
+                tfOsmUserName.setText(pa.getUserName() == null? "" : pa.getUserName());
+                tfOsmPassword.setText(pa.getPassword() == null ? "" : String.valueOf(pa.getPassword()));
+            }
         } catch(CredentialsManagerException e) {
             e.printStackTrace();