diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index e447a97d2e..4522d89060 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -102,7 +102,9 @@ void PCB_BASE_FRAME::InstallPadOptionsFrame( D_PAD* aPad )
     if( dlg.ShowQuasiModal() == wxID_OK )       // QuasiModal required for NET_SELECTOR
     {
         FOOTPRINT_EDITOR_TOOLS* fpTools = m_toolManager->GetTool<FOOTPRINT_EDITOR_TOOLS>();
-        fpTools->SetLastPadName( aPad->GetName() );
+
+        if( fpTools )
+            fpTools->SetLastPadName( aPad->GetName() );
     }
 }