diff --git a/include/wx/rtti.h b/include/wx/rtti.h
index 308b65767b..34d8d387bf 100644
--- a/include/wx/rtti.h
+++ b/include/wx/rtti.h
@@ -85,10 +85,22 @@ public:
 
     bool IsKindOf(const wxClassInfo *info) const
     {
-        return info != 0 &&
-               ( info == this ||
-                 ( m_baseInfo1 && m_baseInfo1->IsKindOf(info) ) ||
-                 ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
+        if ( info == this )
+            return true;
+
+        if ( m_baseInfo1 )
+        {
+            if ( m_baseInfo1->IsKindOf(info) )
+                return true;
+        }
+
+        if ( m_baseInfo2 )
+        {
+            if ( m_baseInfo2->IsKindOf(info) )
+                return true;
+        }
+
+        return false;
     }
 
     wxDECLARE_CLASS_INFO_ITERATORS();