5 files changed, 19 insertions, 14 deletions
diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp
index 50dd8f7e4..7e6fe380d 100644
--- a/src/gui/widgets/characterviewnormal.cpp
+++ b/src/gui/widgets/characterviewnormal.cpp
@@ -45,9 +45,9 @@ CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget,
             character->setVisible(true);
         }
         show(0);
+        const CharacterDisplay *const firtChar = (*mCharacterEntries)[0];
+        setWidth(firtChar->getWidth() * 5 + mPadding * 2);
     }
-    const CharacterDisplay *const firtChar = (*mCharacterEntries)[0];
-    setWidth(firtChar->getWidth() * 5 + mPadding * 2);
     setHeight(210 + config.getIntValue("fontSize") * 2);
 }
 
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index e40b1ce18..3d79a2a2e 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -639,8 +639,12 @@ void ScrollArea::widgetResized(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
     const unsigned int frameSize = 2 * mFrameSize;
-    getContent()->setSize(mDimension.width - frameSize,
-        mDimension.height - frameSize);
+    gcn::Widget *const content = getContent();
+    if (content)
+    {
+        content->setSize(mDimension.width - frameSize,
+            mDimension.height - frameSize);
+    }
 }
 
 void ScrollArea::widgetMoved(const gcn::Event& event A_UNUSED)
@@ -915,15 +919,11 @@ gcn::Rectangle ScrollArea::getVerticalMarkerDimension()
         if (length > height)
             length = height;
 
-        if (getVerticalMaxScroll() != 0)
-        {
-            pos = ((height - length) * mVScroll)
-                / getVerticalMaxScroll();
-        }
+        const int maxScroll = getVerticalMaxScroll();
+        if (maxScroll != 0)
+            pos = ((height - length) * mVScroll) / maxScroll;
         else
-        {
             pos = 0;
-        }
     }
 
     return gcn::Rectangle(mDimension.width - mScrollbarWidth, h2 + pos,
diff --git a/src/gui/widgets/skillmodel.cpp b/src/gui/widgets/skillmodel.cpp
index c4d79e450..fab83cb46 100644
--- a/src/gui/widgets/skillmodel.cpp
+++ b/src/gui/widgets/skillmodel.cpp
@@ -43,8 +43,9 @@ SkillInfo *SkillModel::getSkillAt(const int i) const
 
 std::string SkillModel::getElementAt(int i)
 {
-    if (getSkillAt(i))
-        return getSkillAt(i)->data->name;
+    const SkillInfo *const info = getSkillAt(i);
+    if (info)
+        return info->data->name;
     else
         return std::string();
 }
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index b4a8cb158..2659ab7f9 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -331,6 +331,9 @@ void ChatTab::chatLog(std::string line, Own own,
 
 void ChatTab::chatLog(const std::string &nick, std::string msg)
 {
+    if (!player_node)
+        return;
+
     const Own byWho = (nick == player_node->getName() ? BY_PLAYER : BY_OTHER);
     if (byWho == BY_OTHER && config.getBoolValue("removeColors"))
         msg = removeColors(msg);
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 13303bd88..c29da4a8a 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -279,7 +279,8 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
             break;
         case UserPalette::ATTACK_RANGE_BORDER:
         case UserPalette::HOME_PLACE_BORDER:
-            mTextPreview->setFont(gui->getFont());
+            if (gui)
+                mTextPreview->setFont(gui->getFont());
             mTextPreview->setTextColor(col);
             mTextPreview->setOutline(false);
             mTextPreview->setShadow(false);