2 files changed, 7 insertions, 3 deletions
diff --git a/src/listeners/charrenamelistener.cpp b/src/listeners/charrenamelistener.cpp
index a170cb9f3..13d6f69f1 100644
--- a/src/listeners/charrenamelistener.cpp
+++ b/src/listeners/charrenamelistener.cpp
@@ -41,7 +41,8 @@ void CharRenameListener::action(const ActionEvent &event)
         return;
     if (mDialog)
     {
-        charServerHandler->renameCharacter(mId, mDialog->getMsg());
+        if (charServerHandler)
+            charServerHandler->renameCharacter(mId, mDialog->getMsg());
         mDialog = nullptr;
     }
 }
diff --git a/src/listeners/guitableactionlistener.cpp b/src/listeners/guitableactionlistener.cpp
index d0a2b7a18..70ec49129 100644
--- a/src/listeners/guitableactionlistener.cpp
+++ b/src/listeners/guitableactionlistener.cpp
@@ -56,6 +56,9 @@ GuiTableActionListener::~GuiTableActionListener()
 
 void GuiTableActionListener::action(const ActionEvent &actionEvent A_UNUSED)
 {
-    mTable->setSelected(mRow, mColumn);
-    mTable->distributeActionEvent();
+    if (mTable)
+    {
+        mTable->setSelected(mRow, mColumn);
+        mTable->distributeActionEvent();
+    }
 }