Index: mozilla/layout/forms/nsIsIndexFrame.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/forms/nsIsIndexFrame.cpp,v
retrieving revision 1.76
diff -pU7 -r1.76 mozilla/layout/forms/nsIsIndexFrame.cpp
--- mozilla/layout/forms/nsIsIndexFrame.cpp
+++ mozilla/layout/forms/nsIsIndexFrame.cpp
@@ -472,22 +472,22 @@ NS_IMETHODIMP nsIsIndexFrame::GetEncoder
   
   // Get Charset, get the encoder.
   nsICharsetConverterManager * ccm = nsnull;
   rv = CallGetService(kCharsetConverterManagerCID, &ccm);
   if(NS_SUCCEEDED(rv) && (nsnull != ccm)) {
      rv = ccm->GetUnicodeEncoderRaw(charset.get(), encoder);
      NS_RELEASE(ccm);
-     if (nsnull == encoder) {
+     if (!*encoder) {
        rv = NS_ERROR_FAILURE;
      }
      if (NS_SUCCEEDED(rv)) {
        rv = (*encoder)->SetOutputErrorBehavior(nsIUnicodeEncoder::kOnError_Replace, nsnull, (PRUnichar)'?');
      }
   }
-  return NS_OK;
+  return rv;
 }
 
 // XXX i18n helper routines
 char*
 nsIsIndexFrame::UnicodeToNewBytes(const PRUnichar* aSrc, PRUint32 aLen, nsIUnicodeEncoder* encoder)
 {
    char* res = nsnull;