Index: trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java	(revision 7064)
+++ trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java	(revision 7067)
@@ -14,9 +14,7 @@
     protected Map<RequestorType, PasswordAuthentication> memoryCredentialsCache = new HashMap<>();
 
-    /**
-     * @see CredentialsAgent#getCredentials
-     */
     @Override
-    public CredentialsAgentResponse getCredentials(final RequestorType requestorType, final String host, boolean noSuccessWithLastResponse) throws CredentialsAgentException{
+    public CredentialsAgentResponse getCredentials(final RequestorType requestorType, final String host, boolean noSuccessWithLastResponse)
+            throws CredentialsAgentException {
         if (requestorType == null)
             return null;
@@ -63,5 +61,5 @@
                 }
             });
-            if (response.isCanceled()) {
+            if (response.isCanceled() || response.getUsername() == null || response.getPassword() == null) {
                 return response;
             }