diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 1e5af7a898..18f4dbbefc 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -1122,8 +1122,9 @@ bool wxPropertyGridManager::IsPropertySelected( wxPGPropArg id ) const
 
 wxPGProperty* wxPropertyGridManager::GetPageRoot( int index ) const
 {
-    wxASSERT( index >= 0 );
-    wxASSERT( index < (int)m_arrPages.size() );
+    wxCHECK_MSG( (index >= 0) && (index < (int)m_arrPages.size()),
+                 NULL,
+                 wxT("invalid page index") );
 
     return m_arrPages[index]->GetStatePtr()->m_properties;
 }