diff --git a/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp b/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
index 9f253e4336a72af67b4106ed1218209a099b5e19..b79ed4e66b31430b59888677c84e99af637218dc 100644
--- a/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
+++ b/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
@@ -64,7 +64,9 @@ void ViewerPluginCreateEventInterface::setMessage(const KMime::Message::Ptr &val
 
 void ViewerPluginCreateEventInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mEventEdit) {
+        mEventEdit->slotCloseWidget();
+    }
 }
 
 void ViewerPluginCreateEventInterface::showWidget()
diff --git a/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp b/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
index f7854757ba69ad6df8f8ba0cb13f9846ee0a4b39..6ddf587acf6ad81ca4edeaf2ed40bc3a70cbe9b9 100644
--- a/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
+++ b/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenoteinterface.cpp
@@ -62,7 +62,9 @@ void ViewerPluginCreatenoteInterface::setMessage(const KMime::Message::Ptr &valu
 
 void ViewerPluginCreatenoteInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mNoteEdit) {
+        mNoteEdit->slotCloseWidget();
+    }
 }
 
 Akonadi::Relation ViewerPluginCreatenoteInterface::relatedNoteRelation() const
diff --git a/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp b/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
index fd41c3ab51d7499bc8ea3585c1dd09ee98baafea..befdd0c14c1f01460ea303e2532cdc4b57e21bb4 100644
--- a/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
+++ b/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
@@ -59,7 +59,9 @@ void ViewerPluginCreateTodoInterface::setMessage(const KMime::Message::Ptr &valu
 
 void ViewerPluginCreateTodoInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mTodoEdit) {
+        mTodoEdit->slotCloseWidget();
+    }
 }
 
 void ViewerPluginCreateTodoInterface::showWidget()