diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index d96a3f500872ac08614e32cf4a2cf266c4ea8ac7..e323ff0651a61eaf7f4aa937860c26b5100fb68c 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -762,10 +762,6 @@ void CPPEditor::findUsages()
 
 void CPPEditor::renameUsages()
 {
-    Core::EditorManager::instance()->showEditorInfoBar(QLatin1String("CppEditor.Rename"),
-                                                       tr("This change cannot be undone."),
-                                                       tr("Yes, I know what I am doing."),
-                                                       this, SLOT(hideRenameNotification()));
     renameUsagesNow();
 }
 
@@ -777,7 +773,14 @@ void CPPEditor::hideRenameNotification()
 void CPPEditor::renameUsagesNow()
 {
     if (Symbol *canonicalSymbol = markSymbols()) {
-        m_modelManager->renameUsages(canonicalSymbol);
+        if (canonicalSymbol->identifier() != 0) {
+            Core::EditorManager::instance()->showEditorInfoBar(QLatin1String("CppEditor.Rename"),
+                                                               tr("This change cannot be undone."),
+                                                               tr("Yes, I know what I am doing."),
+                                                               this, SLOT(hideRenameNotification()));
+
+            m_modelManager->renameUsages(canonicalSymbol);
+        }
     }
 }
 
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index eb90a18678619030df2ff9cb29da4d6e4b244bf3..06ae9790602dc07c6bc14437d4b00fc5606c29c7 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -656,6 +656,9 @@ void CppFindReferences::renameUsages(Symbol *symbol)
 
 void CppFindReferences::findAll_helper(Symbol *symbol)
 {
+    if (! (symbol && symbol->identifier()))
+        return;
+
     _resultWindow->popup(true);
 
     const Snapshot snapshot = _modelManager->snapshot();