diff --git a/editor/libeditor/html/nsHTMLCSSUtils.cpp b/editor/libeditor/html/nsHTMLCSSUtils.cpp
index ac1a34745297..7a2c9e803d0d 100644
--- a/editor/libeditor/html/nsHTMLCSSUtils.cpp
+++ b/editor/libeditor/html/nsHTMLCSSUtils.cpp
@@ -336,12 +336,16 @@ nsHTMLCSSUtils::IsCSSEditableProperty(nsIDOMNode * aNode,
                                       nsIAtom * aProperty,
                                       const nsAString * aAttribute)
 {
+  NS_ASSERTION(aNode, "Shouldn't you pass aNode? - Bug 214025");
+
   nsCOMPtr<nsIDOMNode> node = aNode;
   // we need an element node here
   if (mHTMLEditor->IsTextNode(aNode)) {
     aNode->GetParentNode(getter_AddRefs(node));
   }
   nsCOMPtr<nsIContent> content = do_QueryInterface(node);
+  if (!content) return PR_FALSE;
+
   nsCOMPtr<nsIAtom> tagName;
   content->GetTag(getter_AddRefs(tagName));
 
diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp
index f8c9a590097a..2ee2ac01ed76 100644
--- a/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -1,4 +1,4 @@
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -838,36 +838,39 @@ nsHTMLEditRules::GetAlignment(PRBool *aMixed, nsIHTMLEditor::EAlignment *aAlign)
 
   if (!blockParent) return NS_ERROR_FAILURE;
 
-  if (useCSS && mHTMLEditor->mHTMLCSSUtils->IsCSSEditableProperty(blockParent, dummyProperty, &typeAttrName))
+  if (useCSS)
   {
-    // we are in CSS mode and we know how to align this element with CSS
-    nsAutoString value;
-    // let's get the value(s) of text-align or margin-left/margin-right
-    mHTMLEditor->mHTMLCSSUtils->GetCSSEquivalentToHTMLInlineStyleSet(blockParent,
+    nsCOMPtr<nsIContent> blockParentContent = do_QueryInterface(blockParent);
+    if (blockParentContent && 
+        mHTMLEditor->mHTMLCSSUtils->IsCSSEditableProperty(blockParent, dummyProperty, &typeAttrName))
+    {
+      // we are in CSS mode and we know how to align this element with CSS
+      nsAutoString value;
+      // let's get the value(s) of text-align or margin-left/margin-right
+      mHTMLEditor->mHTMLCSSUtils->GetCSSEquivalentToHTMLInlineStyleSet(blockParent,
                                                      dummyProperty,
                                                      &typeAttrName,
                                                      value,
                                                      COMPUTED_STYLE_TYPE);
-    if (value.Equals(NS_LITERAL_STRING("center")) ||
-        value.Equals(NS_LITERAL_STRING("-moz-center")) ||
-        value.Equals(NS_LITERAL_STRING("auto auto")))
-    {
-      *aAlign = nsIHTMLEditor::eCenter;
-      return NS_OK;
-    }
-    else if (value.Equals(NS_LITERAL_STRING("right")) ||
-             value.Equals(NS_LITERAL_STRING("-moz-right")) ||
-             value.Equals(NS_LITERAL_STRING("auto 0px")))
-    {
-      *aAlign = nsIHTMLEditor::eRight;
-      return NS_OK;
-    }
-    else if (value.Equals(NS_LITERAL_STRING("justify")))
-    {
-      *aAlign = nsIHTMLEditor::eJustify;
-      return NS_OK;
-    }
-    else    {
+      if (value.Equals(NS_LITERAL_STRING("center")) ||
+          value.Equals(NS_LITERAL_STRING("-moz-center")) ||
+          value.Equals(NS_LITERAL_STRING("auto auto")))
+      {
+        *aAlign = nsIHTMLEditor::eCenter;
+        return NS_OK;
+      }
+      if (value.Equals(NS_LITERAL_STRING("right")) ||
+          value.Equals(NS_LITERAL_STRING("-moz-right")) ||
+          value.Equals(NS_LITERAL_STRING("auto 0px")))
+      {
+        *aAlign = nsIHTMLEditor::eRight;
+        return NS_OK;
+      }
+      if (value.Equals(NS_LITERAL_STRING("justify")))
+      {
+        *aAlign = nsIHTMLEditor::eJustify;
+        return NS_OK;
+      }
       *aAlign = nsIHTMLEditor::eLeft;
       return NS_OK;
     }