--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Fri Dec 18 09:34:19 2009 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Fri Dec 18 09:53:53 2009 -0600
@@ -72,7 +72,7 @@
 	private static final String CONNECTION_DATA_XML = "connectionData.xml"; //$NON-NLS-1$
 	private static final String NAME_SUFFIX_PATTERN = "(.+) \\((\\d+)\\)"; //$NON-NLS-1$
 	private static final String NAME_FMT = "{0} ({1})"; //$NON-NLS-1$
-	private static Registry instance;
+	private static Registry instance = new Registry();
 	
 	private List<IExtensionFilter> extensionFilters;
 	private Map<String, IConnectionType> connectionTypeIdMap;
@@ -85,10 +85,6 @@
 	private IConnection defaultConnection;
 
 	public static Registry instance() {
-		if (instance == null) {
-			instance = new Registry();
-		}
-		
 		return instance;
 	}
 	
@@ -480,7 +476,7 @@
 	}
 	
 	private void fireConnectionAdded(IConnection connection) {
-		if (listeners == null)
+		if (connectionListeners == null)
 			return;
 		for (IConnectionListener listener : connectionListeners) {
 			listener.connectionAdded(connection);
@@ -488,7 +484,7 @@
 	}
 	
 	private void fireConnectionRemoved(IConnection connection) {
-		if (listeners == null)
+		if (connectionListeners == null)
 			return;
 		for (IConnectionListener listener : connectionListeners) {
 			listener.connectionRemoved(connection);
@@ -496,7 +492,7 @@
 	}
 	
 	private void fireDefaultConnectionSet(IConnection connection) {
-		if (listeners == null)
+		if (connectionListeners == null)
 			return;
 		for (IConnectionListener listener : connectionListeners) {
 			listener.defaultConnectionSet(connection);