diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
index e5f423b7d7b..5c7a0134c26 100644
--- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
+++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
@@ -1217,6 +1217,8 @@ nsPlaintextEditor::GetWrapWidth(PRInt32 *aWrapColumn)
   nsCOMPtr<nsIStyleContext> styleContext;
   res = GetBodyStyleContext(getter_AddRefs(styleContext));
   if (NS_FAILED(res)) return res;
+  NS_ASSERTION(styleContext, "styleContext is null!");
+  if (!styleContext) return NS_ERROR_FAILURE;
 
   const nsStyleText* styleText =
     (const nsStyleText*)styleContext->GetStyleData(eStyleStruct_Text);
@@ -1232,15 +1234,9 @@ nsPlaintextEditor::GetWrapWidth(PRInt32 *aWrapColumn)
     if (stylePosition->mWidth.GetUnit() == eStyleUnit_Chars)
       *aWrapColumn = stylePosition->mWidth.GetIntValue(); 
     else 
-    {
-      *aWrapColumn = -1;
       return NS_ERROR_UNEXPECTED;
-    }
-  }
-  else
-  {
-    *aWrapColumn = -1;
   }
+
   return NS_OK;
 }