diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index d15d20fa33..b72dd29d51 100644
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -265,6 +265,9 @@ wxGenericImageList::Replace(int index,
 
 bool wxGenericImageList::Remove( int index )
 {
+    if ( index < 0 || (size_t)index >= m_images.size() )
+        return false;
+
     m_images.erase(m_images.begin() + index);
 
     return true;