Catch ExceptionInInitializerError for better traceability of programming errors.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/net/java/sip/communicator/service/protocol/AccountManager.java b/src/net/java/sip/communicator/service/protocol/AccountManager.java
index 70c4e84..00e1a06 100644
--- a/src/net/java/sip/communicator/service/protocol/AccountManager.java
+++ b/src/net/java/sip/communicator/service/protocol/AccountManager.java
@@ -22,7 +22,6 @@ import java.util.*;
 import net.java.sip.communicator.service.credentialsstorage.*;

 import net.java.sip.communicator.service.protocol.event.*;

 import net.java.sip.communicator.util.*;

-import net.java.sip.communicator.util.Base64;

 

 import org.jitsi.service.configuration.*;

 import org.osgi.framework.*;

@@ -216,13 +215,19 @@ public class AccountManager
             }

             catch (Exception ex)

             {

-

                 /*

                  * Swallow the exception in order to prevent a single account

                  * from halting the loading of subsequent accounts.

                  */

                 logger.error("Failed to load account " + accountProperties, ex);

             }

+            catch (ExceptionInInitializerError ex)

+            {

+                // In case we fail to instantiate the ProtocolProviderService.

+                logger.error(

+                    "Failed to create account service instance for account "

+                        + accountProperties, ex);

+            }

         }

     }