diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 6ca5ce57db..b1b55589f0 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -205,6 +205,8 @@ wxComboBox::~wxComboBox()
 
 wxSize wxComboBox::DoGetBestSize() const
 {
+    if (!m_choice || !m_text)
+        return GetSize();
     wxSize size = m_choice->GetBestSize();
     
     if ( m_text != NULL )