5 files changed, 3 insertions, 10 deletions
diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 8cf49da4b..1276b82b2 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -67,7 +67,6 @@
 
 #include "gui/base/widgets/button.hpp"
 
-#include "gui/base/exception.hpp"
 #include "gui/base/font.hpp"
 #include "gui/base/key.hpp"
 #include "gui/base/mouseinput.hpp"
diff --git a/src/gui/base/widgets/container.cpp b/src/gui/base/widgets/container.cpp
index d72f2a682..6026b920d 100644
--- a/src/gui/base/widgets/container.cpp
+++ b/src/gui/base/widgets/container.cpp
@@ -67,7 +67,6 @@
 
 #include "gui/base/widgets/container.hpp"
 
-#include "gui/base/exception.hpp"
 
 #include "render/graphics.h"
 
diff --git a/src/gui/base/widgets/label.cpp b/src/gui/base/widgets/label.cpp
index f4576d908..c23666eac 100644
--- a/src/gui/base/widgets/label.cpp
+++ b/src/gui/base/widgets/label.cpp
@@ -67,7 +67,6 @@
 
 #include "gui/base/widgets/label.hpp"
 
-#include "gui/base/exception.hpp"
 #include "gui/base/font.hpp"
 
 #include "render/graphics.h"
diff --git a/src/gui/base/widgets/scrollarea.cpp b/src/gui/base/widgets/scrollarea.cpp
index ffcaffdb1..f76226bc5 100644
--- a/src/gui/base/widgets/scrollarea.cpp
+++ b/src/gui/base/widgets/scrollarea.cpp
@@ -67,7 +67,6 @@
 
 #include "gui/base/widgets/scrollarea.hpp"
 
-#include "gui/base/exception.hpp"
 
 #include "render/graphics.h"
 
@@ -300,8 +299,6 @@ namespace gcn
     {
         if (width > 0)
             mScrollbarWidth = width;
-        else
-            throw GCN_EXCEPTION("Width should be greater then 0.");
     }
 
     int ScrollArea::getScrollbarWidth() const
@@ -446,7 +443,7 @@ namespace gcn
                 break;
 
             default:
-                throw GCN_EXCEPTION("Horizontal scroll policy invalid.");
+                break;
         }
 
         switch (mVPolicy)
@@ -471,7 +468,7 @@ namespace gcn
                 }
                 break;
             default:
-                throw GCN_EXCEPTION("Vertical scroll policy invalid.");
+                break;
         }
     }
 
@@ -491,7 +488,7 @@ namespace gcn
     {
         const Widget *const content = getContent();
         if (widget != content)
-            throw GCN_EXCEPTION("Widget not content widget");
+            return;
 
         BasicContainer::showWidgetPart(widget, area);
 
diff --git a/src/gui/base/widgets/window.cpp b/src/gui/base/widgets/window.cpp
index 02611f819..9207fe449 100644
--- a/src/gui/base/widgets/window.cpp
+++ b/src/gui/base/widgets/window.cpp
@@ -67,7 +67,6 @@
 
 #include "gui/base/widgets/window.hpp"
 
-#include "gui/base/exception.hpp"
 #include "gui/base/font.hpp"
 #include "gui/base/mouseinput.hpp"