1 files changed, 4 insertions, 2 deletions
diff --git a/src/listeners/awaylistener.cpp b/src/listeners/awaylistener.cpp
index bdcd6e7ea..3261fe403 100644
--- a/src/listeners/awaylistener.cpp
+++ b/src/listeners/awaylistener.cpp
@@ -35,11 +35,13 @@
 
 void AwayListener::action(const ActionEvent &event)
 {
-    if (event.getId() == "ok" && localPlayer && settings.awayMode)
+    if (event.getId() == "ok" &&
+        localPlayer != nullptr &&
+        settings.awayMode)
     {
         GameModifiers::changeAwayMode(true);
         localPlayer->updateStatus();
-        if (outfitWindow)
+        if (outfitWindow != nullptr)
             outfitWindow->unwearAwayOutfit();
         UpdateStatusListener::distributeEvent();
     }