diff --git a/intl/ctl/src/nsUnicodeToSunIndic.cpp b/intl/ctl/src/nsUnicodeToSunIndic.cpp
index acb17574b7e5..d4b423686e32 100644
--- a/intl/ctl/src/nsUnicodeToSunIndic.cpp
+++ b/intl/ctl/src/nsUnicodeToSunIndic.cpp
@@ -53,9 +53,9 @@ nsUnicodeToSunIndic::SetOutputErrorBehavior(PRInt32           aBehavior,
 {
   if (aBehavior == kOnError_CallBack && aEncoder == nsnull)
      return NS_ERROR_NULL_POINTER;
-  NS_IF_RELEASE(aEncoder);
+  NS_IF_RELEASE(mErrEncoder);
   mErrEncoder = aEncoder;
-  NS_IF_ADDREF(aEncoder);
+  NS_IF_ADDREF(mErrEncoder);
 
   mErrBehavior = aBehavior;
   mErrChar = aChar;
diff --git a/intl/ctl/src/nsUnicodeToThaiTTF.cpp b/intl/ctl/src/nsUnicodeToThaiTTF.cpp
index cce2fa79fb62..499d54be03df 100644
--- a/intl/ctl/src/nsUnicodeToThaiTTF.cpp
+++ b/intl/ctl/src/nsUnicodeToThaiTTF.cpp
@@ -148,9 +148,9 @@ nsUnicodeToThaiTTF::SetOutputErrorBehavior(PRInt32 aBehavior,
 {
   if (aBehavior == kOnError_CallBack && aEncoder == nsnull)
     return NS_ERROR_NULL_POINTER;
-  NS_IF_RELEASE(aEncoder);
+  NS_IF_RELEASE(mErrEncoder);
   mErrEncoder = aEncoder;
-  NS_IF_ADDREF(aEncoder);
+  NS_IF_ADDREF(mErrEncoder);
   
   mErrBehavior = aBehavior;
   mErrChar = aChar;
diff --git a/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp b/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp
index 1a0201196406..bf32f235b207 100644
--- a/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp
+++ b/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp
@@ -168,9 +168,9 @@ nsUnicodeToJamoTTF::SetOutputErrorBehavior(PRInt32 aBehavior,
 {
   if (aBehavior == kOnError_CallBack && aEncoder == nsnull)
     return NS_ERROR_NULL_POINTER;
-  NS_IF_RELEASE(aEncoder);
+  NS_IF_RELEASE(mErrEncoder);
   mErrEncoder = aEncoder;
-  NS_IF_ADDREF(aEncoder);
+  NS_IF_ADDREF(mErrEncoder);
   
   mErrBehavior = aBehavior;
   mErrChar = aChar;
diff --git a/intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp b/intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp
index 694d77237bf5..7eac8e12d16e 100644
--- a/intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp
+++ b/intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp
@@ -524,9 +524,9 @@ nsUnicodeToTamilTTF::SetOutputErrorBehavior(PRInt32 aBehavior,
 {
   if (aBehavior == kOnError_CallBack && aEncoder == nsnull)
     return NS_ERROR_NULL_POINTER;
-  NS_IF_RELEASE(aEncoder);
+  NS_IF_RELEASE(mErrEncoder);
   mErrEncoder = aEncoder;
-  NS_IF_ADDREF(aEncoder);
+  NS_IF_ADDREF(mErrEncoder);
   
   mErrBehavior = aBehavior;
   mErrChar = aChar;
diff --git a/intl/uconv/util/nsUCSupport.cpp b/intl/uconv/util/nsUCSupport.cpp
index 65bd9d762390..81a824fb0100 100644
--- a/intl/uconv/util/nsUCSupport.cpp
+++ b/intl/uconv/util/nsUCSupport.cpp
@@ -571,12 +571,12 @@ NS_IMETHODIMP nsEncoderSupport::SetOutputErrorBehavior(
                                 nsIUnicharEncoder * aEncoder, 
                                 PRUnichar aChar)
 {
-  if ((aBehavior == kOnError_CallBack) && (aEncoder == NULL)) 
+  if (aBehavior == kOnError_CallBack && aEncoder == nsnull) 
     return NS_ERROR_NULL_POINTER;
 
-  NS_IF_RELEASE(aEncoder);
+  NS_IF_RELEASE(mErrEncoder);
   mErrEncoder = aEncoder;
-  NS_IF_ADDREF(aEncoder);
+  NS_IF_ADDREF(mErrEncoder);
 
   mErrBehavior = aBehavior;
   mErrChar = aChar;