1 files changed, 12 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java b/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
index 5cd803a..deb221f 100644
--- a/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
+++ b/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
@@ -370,9 +370,18 @@ public abstract class ProtocolProviderFactory
 
                 //if this is a password - decode it first
                 if(propertyName.equals(PASSWORD))
-                    storedPropertyValue = new String(
-                        Base64.decode(storedPropertyValue));
-
+                {
+                    if(storedPropertyValue == null
+                       || storedPropertyValue.length() == 0)
+                    {
+                        storedPropertyValue = "";
+                    }
+                    else
+                    {
+                        storedPropertyValue = new String(
+                            Base64.decode(storedPropertyValue));
+                    }
+                }
                 accountProperties.put(propertyName, storedPropertyValue);
             }
             loadAccount(accountProperties);