diff --git a/toonz/sources/tnztools/tooloptions.cpp b/toonz/sources/tnztools/tooloptions.cpp
index e905522..fdbc903 100644
--- a/toonz/sources/tnztools/tooloptions.cpp
+++ b/toonz/sources/tnztools/tooloptions.cpp
@@ -910,7 +910,7 @@ ArrowToolOptionsBox::ArrowToolOptionsBox(
           SLOT(receiveMouseMove(QMouseEvent *)));
   connect(m_nsCenterLabel, SIGNAL(onMouseRelease(QMouseEvent *)),
           m_nsCenterField, SLOT(receiveMouseRelease(QMouseEvent *)));
-          
+
   if (globalKeyProp) {
     std::string actionName = "A_ToolOption_" + globalKeyProp->getId();
     QAction *a = CommandManager::instance()->getAction(actionName.c_str());
@@ -1639,7 +1639,7 @@ FillToolOptionsBox::FillToolOptionsBox(QWidget *parent, TTool *tool,
     if (m_toolType->currentText() == QString("Normal") ||
         m_multiFrameMode->isChecked())
       m_onionMode->setEnabled(false);
-    m_autopaintMode->setEnabled(false);
+    if (m_autopaintMode) m_autopaintMode->setEnabled(false);
   }
   if (m_toolType->currentText().toStdWString() != L"Normal") {
     if (m_segmentMode) m_segmentMode->setEnabled(false);
@@ -1663,7 +1663,7 @@ void FillToolOptionsBox::updateStatus() {
 void FillToolOptionsBox::onColorModeChanged() {
   bool enabled = m_colorMode->currentText() != QString("Lines");
   m_selectiveMode->setEnabled(enabled);
-  if(m_autopaintMode) m_autopaintMode->setEnabled(enabled);
+  if (m_autopaintMode) m_autopaintMode->setEnabled(enabled);
   if (m_fillDepthLabel && m_fillDepthField) {
     m_fillDepthLabel->setEnabled(enabled);
     m_fillDepthField->setEnabled(enabled);