diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 74b01d4174..2ab54469a6 100644
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -787,7 +787,7 @@ int wxComboBox::FindString(const wxString& s) const
 
 void wxComboBox::Select(int n)
 {
-    wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Select") );
+	wxCHECK_RET( (n >= 0) && (n < GetCount()) && (GetCount() > 0), _T("invalid index in wxComboBox::Select ") );
 
     GetLBox()->SetSelection(n);
     GetText()->SetValue(GetLBox()->GetString(n));