diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index a296741aa05..dfbacfafb3a 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -880,19 +880,21 @@ void EditorManager::closeDuplicate(Core::IEditor *editor)
 
     emit editorAboutToClose(editor);
 
-    EditorView *view = m_d->m_splitter->findView(editor)->view();
-    removeEditor(editor);
-    view->removeEditor(editor);
+    if(m_d->m_splitter->findView(editor)) {
+        EditorView *view = m_d->m_splitter->findView(editor)->view();
+        removeEditor(editor);
+        view->removeEditor(editor);
 
-    IEditor *newCurrent = view->currentEditor();
-    if (!newCurrent)
-        newCurrent = pickUnusedEditor();
-    if (newCurrent) {
-        activateEditor(view, newCurrent, NoActivate);
-    } else {
-        QModelIndex idx = m_d->m_editorModel->firstRestoredEditor();
-        if (idx.isValid())
-            activateEditor(idx, view, NoActivate);
+        IEditor *newCurrent = view->currentEditor();
+        if (!newCurrent)
+            newCurrent = pickUnusedEditor();
+        if (newCurrent) {
+            activateEditor(view, newCurrent, NoActivate);
+        } else {
+            QModelIndex idx = m_d->m_editorModel->firstRestoredEditor();
+            if (idx.isValid())
+                activateEditor(idx, view, NoActivate);
+        }
     }
 
     emit editorsClosed(QList<IEditor*>() << editor);
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 11454fe015d..df275cc40e5 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -223,16 +223,17 @@ QList<BuildConfigWidget *> BuildSettingsWidget::subWidgets() const
 void BuildSettingsWidget::updateAddButtonMenu()
 {
     m_addButtonMenu->clear();
-    if (m_target &&
-        m_target->activeBuildConfiguration()) {
-        m_addButtonMenu->addAction(tr("&Clone Selected"),
-                                   this, SLOT(cloneConfiguration()));
-    }
-    IBuildConfigurationFactory *factory = m_target->buildConfigurationFactory();
-    if (factory) {
-        foreach (const QString &id, factory->availableCreationIds(m_target)) {
-            QAction *action = m_addButtonMenu->addAction(factory->displayNameForId(id), this, SLOT(createConfiguration()));
-            action->setData(id);
+    if (m_target) {
+        if (m_target->activeBuildConfiguration()) {
+            m_addButtonMenu->addAction(tr("&Clone Selected"),
+                                       this, SLOT(cloneConfiguration()));
+        }
+        IBuildConfigurationFactory *factory = m_target->buildConfigurationFactory();
+        if (factory) {
+            foreach (const QString &id, factory->availableCreationIds(m_target)) {
+                QAction *action = m_addButtonMenu->addAction(factory->displayNameForId(id), this, SLOT(createConfiguration()));
+                action->setData(id);
+            }
         }
     }
 }
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 839a3b21382..a51274bc012 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -1118,9 +1118,10 @@ void MyGroupBox::paintEvent(QPaintEvent * event)
     QGroupBox::paintEvent(event);
     if (m_animated) {
         QPainter p(this);
-        p.setOpacity(m_alpha);
-        if (!m_pixmap.isNull() && !m_firstExpand)
+        if (!m_pixmap.isNull() && !m_firstExpand) {
+            p.setOpacity(m_alpha);
             p.drawPixmap(5, 5,  m_pixmap.width(), m_pixmap.height(), m_pixmap);
+        }
     }
 }