diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index fadaf9231841727aec8e889e59f12823d015a4de..9dea8af0bdc28fcff020a627835000935308736a 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -158,6 +158,7 @@ QtVersionManager *QtVersionManager::instance()
 
 void QtVersionManager::addVersion(QtVersion *version)
 {
+    QTC_ASSERT(version != 0, return);
     m_versions.append(version);
     m_uniqueIdToIndex.insert(version->uniqueId(), m_versions.count() - 1);
     emit qtVersionsChanged();
@@ -166,7 +167,9 @@ void QtVersionManager::addVersion(QtVersion *version)
 
 void QtVersionManager::removeVersion(QtVersion *version)
 {
+    QTC_ASSERT(version != 0, return);
     m_versions.removeAll(version);
+    m_uniqueIdToIndex.remove(version->uniqueId());
     emit qtVersionsChanged();
     writeVersionsIntoSettings();
     delete version;