diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 4b3eb201ca..4dac18355a 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -26,6 +26,7 @@ class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
 public:
     // creating the control
     wxDatePickerCtrlGeneric() { Init(); }
+    ~wxDatePickerCtrlGeneric() ;
     wxDatePickerCtrlGeneric(wxWindow *parent,
                             wxWindowID id,
                             const wxDateTime& date = wxDefaultDateTime,
diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index d2feb04557..a8f65fe981 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -521,6 +521,13 @@ void wxDatePickerCtrlGeneric::Init()
     m_ignoreDrop = false;
 }
 
+wxDatePickerCtrlGeneric::~wxDatePickerCtrlGeneric()
+{
+    m_popup = NULL;
+    m_txt = NULL;
+    m_cal = NULL;
+    m_btn = NULL;
+}
 
 bool wxDatePickerCtrlGeneric::Destroy()
 {
@@ -820,6 +827,9 @@ void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev))
 
 void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
 {
+    if (!m_txt)
+        return;
+    
     ev.Skip();
 
     wxDateTime dt;