4 files changed, 22 insertions, 15 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 353212025..9a7a348c8 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1445,16 +1445,8 @@ void ChatWindow::resortChatLog(std::string line, Own own,
         }
         else if (mShowAllLang)
         {
-            if (langChatTab)
-            {
-                langChatTab->chatLog(prefix + line, own,
-                    ignoreRecord, tryRemoveColors);
-            }
-            else if (localChatTab)
-            {
-                localChatTab->chatLog(prefix + line, own,
-                    ignoreRecord, tryRemoveColors);
-            }
+            langChatTab->chatLog(prefix + line, own,
+                ignoreRecord, tryRemoveColors);
         }
     }
     else if (localChatTab && channel.empty())
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 90a8fccd6..24a77a402 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -531,9 +531,17 @@ NetDebugTab::NetDebugTab(const Widget2 *const widget) :
 void NetDebugTab::logic()
 {
     BLOCK_START("NetDebugTab::logic")
-    // TRANSLATORS: debug window label
-    mPingLabel->setCaption(strprintf(_("Ping: %s ms"),
-        player_node->getPingTime().c_str()));
+    if (player_node)
+    {
+        // TRANSLATORS: debug window label
+        mPingLabel->setCaption(strprintf(_("Ping: %s ms"),
+            player_node->getPingTime().c_str()));
+    }
+    else
+    {
+        // TRANSLATORS: debug window label
+        mPingLabel->setCaption(strprintf(_("Ping: %s ms"), "0"));
+    }
     // TRANSLATORS: debug window label
     mInPackets1Label->setCaption(strprintf(_("In: %d bytes/s"),
         PacketCounters::getInBytes()));
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index bbc4558b0..87dc94e8e 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -598,8 +598,12 @@ void StatusWindow::updateWeightBar(ProgressBar *const bar)
         const int totalWeight = PlayerInfo::getAttribute(
             PlayerInfo::TOTAL_WEIGHT);
         const int maxWeight = PlayerInfo::getAttribute(PlayerInfo::MAX_WEIGHT);
-        const float progress = static_cast<float>(totalWeight)
-            / static_cast<float>(maxWeight);
+        float progress = 1.0F;
+        if (maxWeight)
+        {
+            progress = static_cast<float>(totalWeight)
+                / static_cast<float>(maxWeight);
+        }
         bar->setText(strprintf("%s/%s", Units::formatWeight(
             totalWeight).c_str(), Units::formatWeight(maxWeight).c_str()));
         bar->setProgress(progress);
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index e7c60bb39..68979a682 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -329,6 +329,9 @@ void WhoIsOnline::loadWebList()
     // Reallocate and include terminating 0 character
     mMemoryBuffer = static_cast<char*>(
         realloc(mMemoryBuffer, mDownloadedBytes + 1));
+    if (!mMemoryBuffer)
+        return;
+
     mMemoryBuffer[mDownloadedBytes] = '\0';
 
     mBrowserBox->clearRows();