diff --git a/layout/base/src/nsPluginViewer.cpp b/layout/base/src/nsPluginViewer.cpp
index 045a937bc758..8a18bc0462df 100644
--- a/layout/base/src/nsPluginViewer.cpp
+++ b/layout/base/src/nsPluginViewer.cpp
@@ -123,7 +123,8 @@ private:
 class PluginViewerImpl : public nsIContentViewer
 {
 public:
-  PluginViewerImpl(const char* aCommand, nsIStreamListener** aDocListener);
+  PluginViewerImpl(const char* aCommand);
+  nsresult Init(nsIStreamListener** aDocListener);
     
   NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
 
@@ -196,23 +197,36 @@ NS_NewPluginContentViewer(const char* aCommand,
                           nsIStreamListener** aDocListener,
                           nsIContentViewer** aDocViewer)
 {
-  PluginViewerImpl* it = new PluginViewerImpl(aCommand, aDocListener);
+  PluginViewerImpl* it = new PluginViewerImpl(aCommand);
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
+  nsresult rv = it->Init(aDocListener);
+  if (NS_FAILED(rv)) {
+    delete it;
+    return rv;
+  }
   return it->QueryInterface(kIContentViewerIID, (void**) aDocViewer);
 }
 
 // Note: operator new zeros our memory
-PluginViewerImpl::PluginViewerImpl(const char* aCommand,
-                                   nsIStreamListener** aDocListener)
+PluginViewerImpl::PluginViewerImpl(const char* aCommand)
 {
   NS_INIT_REFCNT();
-  nsIStreamListener* it = new PluginListener(this);
-  *aDocListener = it;
   mEnableRendering = PR_TRUE;
 }
 
+nsresult
+PluginViewerImpl::Init(nsIStreamListener** aDocListener)
+{
+  nsIStreamListener* it = new PluginListener(this);
+  if (it == nsnull)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(it);
+  *aDocListener = it;
+  return NS_OK;
+}
+
 // ISupports implementation...
 NS_IMPL_ADDREF(PluginViewerImpl)
 NS_IMPL_RELEASE(PluginViewerImpl)
@@ -592,7 +606,6 @@ PluginListener::PluginListener(PluginViewerImpl* aViewer)
   NS_INIT_REFCNT();
   mViewer = aViewer;
   NS_ADDREF(aViewer);
-  mRefCnt = 1;
 }
 
 PluginListener::~PluginListener()
diff --git a/modules/plugin/base/src/nsPluginViewer.cpp b/modules/plugin/base/src/nsPluginViewer.cpp
index 045a937bc758..8a18bc0462df 100644
--- a/modules/plugin/base/src/nsPluginViewer.cpp
+++ b/modules/plugin/base/src/nsPluginViewer.cpp
@@ -123,7 +123,8 @@ private:
 class PluginViewerImpl : public nsIContentViewer
 {
 public:
-  PluginViewerImpl(const char* aCommand, nsIStreamListener** aDocListener);
+  PluginViewerImpl(const char* aCommand);
+  nsresult Init(nsIStreamListener** aDocListener);
     
   NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
 
@@ -196,23 +197,36 @@ NS_NewPluginContentViewer(const char* aCommand,
                           nsIStreamListener** aDocListener,
                           nsIContentViewer** aDocViewer)
 {
-  PluginViewerImpl* it = new PluginViewerImpl(aCommand, aDocListener);
+  PluginViewerImpl* it = new PluginViewerImpl(aCommand);
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
+  nsresult rv = it->Init(aDocListener);
+  if (NS_FAILED(rv)) {
+    delete it;
+    return rv;
+  }
   return it->QueryInterface(kIContentViewerIID, (void**) aDocViewer);
 }
 
 // Note: operator new zeros our memory
-PluginViewerImpl::PluginViewerImpl(const char* aCommand,
-                                   nsIStreamListener** aDocListener)
+PluginViewerImpl::PluginViewerImpl(const char* aCommand)
 {
   NS_INIT_REFCNT();
-  nsIStreamListener* it = new PluginListener(this);
-  *aDocListener = it;
   mEnableRendering = PR_TRUE;
 }
 
+nsresult
+PluginViewerImpl::Init(nsIStreamListener** aDocListener)
+{
+  nsIStreamListener* it = new PluginListener(this);
+  if (it == nsnull)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(it);
+  *aDocListener = it;
+  return NS_OK;
+}
+
 // ISupports implementation...
 NS_IMPL_ADDREF(PluginViewerImpl)
 NS_IMPL_RELEASE(PluginViewerImpl)
@@ -592,7 +606,6 @@ PluginListener::PluginListener(PluginViewerImpl* aViewer)
   NS_INIT_REFCNT();
   mViewer = aViewer;
   NS_ADDREF(aViewer);
-  mRefCnt = 1;
 }
 
 PluginListener::~PluginListener()
diff --git a/modules/plugin/nglsrc/nsPluginViewer.cpp b/modules/plugin/nglsrc/nsPluginViewer.cpp
index 045a937bc758..8a18bc0462df 100644
--- a/modules/plugin/nglsrc/nsPluginViewer.cpp
+++ b/modules/plugin/nglsrc/nsPluginViewer.cpp
@@ -123,7 +123,8 @@ private:
 class PluginViewerImpl : public nsIContentViewer
 {
 public:
-  PluginViewerImpl(const char* aCommand, nsIStreamListener** aDocListener);
+  PluginViewerImpl(const char* aCommand);
+  nsresult Init(nsIStreamListener** aDocListener);
     
   NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
 
@@ -196,23 +197,36 @@ NS_NewPluginContentViewer(const char* aCommand,
                           nsIStreamListener** aDocListener,
                           nsIContentViewer** aDocViewer)
 {
-  PluginViewerImpl* it = new PluginViewerImpl(aCommand, aDocListener);
+  PluginViewerImpl* it = new PluginViewerImpl(aCommand);
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
+  nsresult rv = it->Init(aDocListener);
+  if (NS_FAILED(rv)) {
+    delete it;
+    return rv;
+  }
   return it->QueryInterface(kIContentViewerIID, (void**) aDocViewer);
 }
 
 // Note: operator new zeros our memory
-PluginViewerImpl::PluginViewerImpl(const char* aCommand,
-                                   nsIStreamListener** aDocListener)
+PluginViewerImpl::PluginViewerImpl(const char* aCommand)
 {
   NS_INIT_REFCNT();
-  nsIStreamListener* it = new PluginListener(this);
-  *aDocListener = it;
   mEnableRendering = PR_TRUE;
 }
 
+nsresult
+PluginViewerImpl::Init(nsIStreamListener** aDocListener)
+{
+  nsIStreamListener* it = new PluginListener(this);
+  if (it == nsnull)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(it);
+  *aDocListener = it;
+  return NS_OK;
+}
+
 // ISupports implementation...
 NS_IMPL_ADDREF(PluginViewerImpl)
 NS_IMPL_RELEASE(PluginViewerImpl)
@@ -592,7 +606,6 @@ PluginListener::PluginListener(PluginViewerImpl* aViewer)
   NS_INIT_REFCNT();
   mViewer = aViewer;
   NS_ADDREF(aViewer);
-  mRefCnt = 1;
 }
 
 PluginListener::~PluginListener()