diff --git a/xpfe/components/prefwindow/src/nsPrefWindow.cpp b/xpfe/components/prefwindow/src/nsPrefWindow.cpp
index 426e21fe2d7..3bf49382d98 100644
--- a/xpfe/components/prefwindow/src/nsPrefWindow.cpp
+++ b/xpfe/components/prefwindow/src/nsPrefWindow.cpp
@@ -1,4 +1,3 @@
-
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Netscape Public License
@@ -397,6 +396,10 @@ nsresult nsPrefWindow::InitializeOneWidget(
             NS_RELEASE(specVal);
             break;
         }
+	case eNoType:
+	{
+		NS_ASSERTION(0, "eNoType not handled");
+	}
     }
     return NS_OK;
 } // nsPrefWindow::InitializeOneWidget
@@ -551,6 +554,10 @@ nsresult nsPrefWindow::FinalizeOneWidget(
             NS_RELEASE(specValue);
             break;
         }
+	case eNoType:
+	{
+		NS_ASSERTION(0, "eNoType not handled");
+	}
     }
 //    if (inWidgetType == "checkbox" || inWidgetType = "radio")
 //    {
diff --git a/xpfe/components/prefwindow/src/nsPrefWindowFactory.cpp b/xpfe/components/prefwindow/src/nsPrefWindowFactory.cpp
index 7c6e2040c61..1c16cd57754 100644
--- a/xpfe/components/prefwindow/src/nsPrefWindowFactory.cpp
+++ b/xpfe/components/prefwindow/src/nsPrefWindowFactory.cpp
@@ -89,7 +89,6 @@ nsresult nsPrefWindowFactory::CreateInstance(
 {  
 	if (aResult == nsnull)  
 		return NS_ERROR_NULL_POINTER;  
-	nsresult rv = NS_OK;
 	*aResult = nsnull;  
   
 //	if (!mClassID.Equals(nsPrefWindow::GetCID()))