diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index dd94db03..6f5d5dac 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -184,7 +184,7 @@ public class SingleSessionManager implements OwnCloudClientManager {
     
 	private void keepCredentialsUpdated(OwnCloudAccount account, OwnCloudClient reusedClient) {
 		OwnCloudCredentials recentCredentials = account.getCredentials();
-		if (!recentCredentials.getAuthToken().equals(
+		if (recentCredentials != null && !recentCredentials.getAuthToken().equals(
 				reusedClient.getCredentials().getAuthToken())) {
 			reusedClient.setCredentials(recentCredentials);
 		}