diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp
index cfb6eb52fc..98c1ba212b 100644
--- a/pcbnew/pcb_base_frame.cpp
+++ b/pcbnew/pcb_base_frame.cpp
@@ -1155,8 +1155,12 @@ void PCB_BASE_FRAME::setFPWatcher( FOOTPRINT* aFootprint )
     if( !aFootprint )
     {
         wxLogTrace( "KICAD_LIB_WATCH", "Remove watch" );
-        m_watcher->RemoveAll();
+
+        if( m_watcher )
+            m_watcher->RemoveAll();
+
         m_watcher.reset();
+
         return;
     }