diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
index 3791fb03a14..bd9c8709075 100644
--- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
+++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
@@ -1955,9 +1955,9 @@ NS_IMETHODIMP
 nsImapIncomingServer::StartPopulatingSubscribeDS()
 {
 	nsresult rv;
-    mInner = do_CreateInstance(kSubscribableServerCID,&rv);
-    if (NS_FAILED(rv)) return rv;
-    if (!mInner) return NS_ERROR_FAILURE;
+
+	NS_ASSERTION(mInner,"not initialized");
+	if (!mInner) return NS_ERROR_FAILURE;
 
     rv = SetIncomingServer(this);
     if (NS_FAILED(rv)) return rv;
@@ -1971,8 +1971,10 @@ nsImapIncomingServer::StartPopulatingSubscribeDS()
 NS_IMETHODIMP
 nsImapIncomingServer::SetSubscribeListener(nsISubscribeListener *aListener)
 {
-	NS_ASSERTION(mInner,"not initialized");
-	if (!mInner) return NS_ERROR_FAILURE;
+	nsresult rv;
+    mInner = do_CreateInstance(kSubscribableServerCID,&rv);
+    if (NS_FAILED(rv)) return rv;
+    if (!mInner) return NS_ERROR_FAILURE;
 	return mInner->SetSubscribeListener(aListener);
 }
 
diff --git a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp
index a74354a9260..6b92ae22156 100644
--- a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp
+++ b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp
@@ -762,9 +762,9 @@ NS_IMETHODIMP
 nsNntpIncomingServer::StartPopulatingSubscribeDS()
 {
 	nsresult rv;
-	mInner = do_CreateInstance(kSubscribableServerCID,&rv);
-    if (NS_FAILED(rv)) return rv;
-    if (!mInner) return NS_ERROR_FAILURE;
+
+	NS_ASSERTION(mInner,"not initialized");
+	if (!mInner) return NS_ERROR_FAILURE;
 
     rv = SetIncomingServer(this);
     if (NS_FAILED(rv)) return rv;
@@ -777,9 +777,12 @@ nsNntpIncomingServer::StartPopulatingSubscribeDS()
 
 NS_IMETHODIMP
 nsNntpIncomingServer::SetSubscribeListener(nsISubscribeListener *aListener)
-{
-	NS_ASSERTION(mInner,"not initialized");
-	if (!mInner) return NS_ERROR_FAILURE;
+{	
+	nsresult rv;
+	mInner = do_CreateInstance(kSubscribableServerCID,&rv);
+    if (NS_FAILED(rv)) return rv;
+    if (!mInner) return NS_ERROR_FAILURE;
+
 	return mInner->SetSubscribeListener(aListener);
 }