diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index c93e43bfad..019530e1c7 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -1903,7 +1903,8 @@ void wxPropertyGridManager::SetPageSplitterLeft(int page, bool subProps)
 
 void wxPropertyGridManager::ReconnectEventHandlers(wxWindowID oldId, wxWindowID newId)
 {
-    wxASSERT( oldId != newId );
+    wxCHECK_RET( oldId != newId,
+                 wxT("Attempting to reconnect event handlers to the same window"));
 
     if (oldId != wxID_NONE)
     {