diff --git a/intl/uconv/src/charsetalias.properties b/intl/uconv/src/charsetalias.properties
index 81c69bfc552..c0f607eb55e 100644
--- a/intl/uconv/src/charsetalias.properties
+++ b/intl/uconv/src/charsetalias.properties
@@ -265,6 +265,8 @@ csisolatin5=ISO-8859-9
 ## Aliases for UTF-8
 ##
 unicode-1-1-utf-8=UTF-8
+# nl_langinfo(CODESET) in HP/UX returns 'utf8' under UTF-8 locales
+utf8=UTF-8
 ##
 ## Aliases for Shift_JIS
 ##
diff --git a/widget/src/gtk/nsWindow.cpp b/widget/src/gtk/nsWindow.cpp
index 3272da52109..96d00a02ba0 100644
--- a/widget/src/gtk/nsWindow.cpp
+++ b/widget/src/gtk/nsWindow.cpp
@@ -2350,6 +2350,9 @@ NS_IMETHODIMP nsWindow::SetTitle(const nsString& aTitle)
   nsCOMPtr<nsICharsetConverterManager> ccm = 
            do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv);  
   rv = ccm->GetUnicodeEncoderRaw(platformCharset.get(), getter_AddRefs(encoder));
+  NS_ASSERTION(NS_SUCCEEDED(rv), "GetUnicodeEncoderRaw failed.");
+  if (NS_FAILED(rv))
+    return NS_ERROR_FAILURE;
 
   // Estimate out length and allocate the buffer based on a worst-case estimate, then do
   // the conversion.