4 files changed, 13 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_fill.cpp b/xfa/fxfa/parser/cxfa_fill.cpp
index e6b289817e..c62006754f 100644
--- a/xfa/fxfa/parser/cxfa_fill.cpp
+++ b/xfa/fxfa/parser/cxfa_fill.cpp
@@ -62,6 +62,9 @@ bool CXFA_Fill::IsVisible() {
 void CXFA_Fill::SetColor(FX_ARGB color) {
   CXFA_Color* pNode =
       JSObject()->GetOrCreateProperty<CXFA_Color>(0, XFA_Element::Color);
+  if (!pNode)
+    return;
+
   int a;
   int r;
   int g;
diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp
index c78e926b27..694cb26147 100644
--- a/xfa/fxfa/parser/cxfa_font.cpp
+++ b/xfa/fxfa/parser/cxfa_font.cpp
@@ -124,9 +124,12 @@ bool CXFA_Font::IsItalic() {
 }
 
 void CXFA_Font::SetColor(FX_ARGB color) {
-  JSObject()
-      ->GetOrCreateProperty<CXFA_Fill>(0, XFA_Element::Fill)
-      ->SetColor(color);
+  CXFA_Fill* node =
+      JSObject()->GetOrCreateProperty<CXFA_Fill>(0, XFA_Element::Fill);
+  if (!node)
+    return;
+
+  node->SetColor(color);
 }
 
 FX_ARGB CXFA_Font::GetColor() {
diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
index 35a1bc8283..c5b7d52caa 100644
--- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
+++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
@@ -290,6 +290,7 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
       pTemplateNode->JSObject()->GetOrCreateProperty<CXFA_PageSet>(
           0, XFA_Element::PageSet);
   ASSERT(m_pTemplatePageSetRoot);
+
   if (m_pPageSetLayoutItemRoot) {
     m_pPageSetLayoutItemRoot->m_pParent = nullptr;
     m_pPageSetLayoutItemRoot->m_pFirstChild = nullptr;
diff --git a/xfa/fxfa/parser/cxfa_stroke.cpp b/xfa/fxfa/parser/cxfa_stroke.cpp
index 8085d3e489..c9c7d73f49 100644
--- a/xfa/fxfa/parser/cxfa_stroke.cpp
+++ b/xfa/fxfa/parser/cxfa_stroke.cpp
@@ -73,6 +73,9 @@ FX_ARGB CXFA_Stroke::GetColor() {
 void CXFA_Stroke::SetColor(FX_ARGB argb) {
   CXFA_Color* pNode =
       JSObject()->GetOrCreateProperty<CXFA_Color>(0, XFA_Element::Color);
+  if (!pNode)
+    return;
+
   int a;
   int r;
   int g;