diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 34dd9b817d..8dc803b88b 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -417,7 +417,7 @@ void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
 void* wxChoice::DoGetItemClientData(unsigned int n) const
 {
     LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0);
-    if ( rc == CB_ERR )
+    if ( rc == CB_ERR && GetLastError() != ERROR_SUCCESS )
     {
         wxLogLastError(wxT("CB_GETITEMDATA"));