2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index c4c69afa1..382cd42bf 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -909,7 +909,7 @@ void Gui::distributeMouseEvent(Widget *const source,
         if (type == MouseEventType::RELEASED)
             dragDrop.clear();
 
-        if (event.isConsumed())
+        if (!widget || event.isConsumed())
             break;
 
         // If a non modal focused widget has been reach
@@ -1306,8 +1306,12 @@ void Gui::distributeKeyEvent(KeyEvent &event) const
 
         // If a non modal focused widget has been reach
         // and we have modal focus cancel the distribution.
-        if (mFocusHandler->getModalFocused() && !widget->isModalFocused())
+        if (widget &&
+            mFocusHandler->getModalFocused() &&
+            !widget->isModalFocused())
+        {
             break;
+        }
     }
 }
 
diff --git a/src/gui/models/playertablemodel.cpp b/src/gui/models/playertablemodel.cpp
index 8844404a9..b846e7b91 100644
--- a/src/gui/models/playertablemodel.cpp
+++ b/src/gui/models/playertablemodel.cpp
@@ -96,10 +96,6 @@ void PlayerTableModel::playerRelationsUpdated()
 
     freeWidgets();
     StringVect *const player_names = player_relations.getPlayers();
-
-    if (!player_names)
-        return;
-
     delete mPlayers;
     mPlayers = player_names;