3 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index c8ff7457a..32ace3af3 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -75,7 +75,8 @@ class ItemPopup final : public Popup
         int mLastId;
         unsigned char mLastColor;
 
-        void setLabelColor(Label *label, const ItemType::Type type) const;
+        void setLabelColor(Label *label,
+                           const ItemType::Type type) const A_NONNULL(2);
 };
 
 extern ItemPopup *itemPopup;
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index f136e5bd5..10ae03365 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -968,6 +968,9 @@ void PopupMenu::showWindowPopup(Window *const window)
 
 void PopupMenu::addWindowMenu(Window *const window)
 {
+    if (!window)
+        return;
+
     if (window->getCloseButton())
     {
         // TRANSLATORS: popup menu item
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index d963591bc..ac6798ce1 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -168,7 +168,7 @@ class PopupMenu final : public Popup, public LinkHandler
 
         void addFollow();
 
-        void addBuySell(const Being *const being);
+        void addBuySell(const Being *const being) A_NONNULL(2);
 
         void addParty(const std::string &nick);
 
@@ -182,7 +182,8 @@ class PopupMenu final : public Popup, public LinkHandler
 
         void addProtection();
 
-        void addUseDrop(const Item *const item, const bool isProtected);
+        void addUseDrop(const Item *const item,
+                        const bool isProtected) A_NONNULL(2);
 
         void addGmCommands();