diff --git a/components/fallback/fallback.cpp b/components/fallback/fallback.cpp
index 010e1025c..11a577a45 100644
--- a/components/fallback/fallback.cpp
+++ b/components/fallback/fallback.cpp
@@ -21,15 +21,16 @@ namespace Fallback
         }
         return it->second;
     }
+
     float Map::getFallbackFloat(const std::string& fall) const
     {
         std::string fallback=getFallbackString(fall);
         if(fallback.empty())
             return 0;
-        else {
-            return  boost::lexical_cast<float>(fallback);
-        }
+        else
+            return boost::lexical_cast<float>(fallback);
     }
+
     int Map::getFallbackInt(const std::string& fall) const
     {
         std::string fallback=getFallbackString(fall);
@@ -47,6 +48,7 @@ namespace Fallback
         else
             return stob(fallback);
     }
+
     osg::Vec4f Map::getFallbackColour(const std::string& fall) const
     {
         std::string sum=getFallbackString(fall);
diff --git a/components/widgets/numericeditbox.cpp b/components/widgets/numericeditbox.cpp
index d59deb378..828a84589 100644
--- a/components/widgets/numericeditbox.cpp
+++ b/components/widgets/numericeditbox.cpp
@@ -1,3 +1,5 @@
+#include <stdexcept>
+
 #include "numericeditbox.hpp"
 
 namespace Gui
@@ -36,7 +38,11 @@ namespace Gui
                 setCaption(MyGUI::utility::toString(mValue));
             }
         }
-        catch (...)
+        catch (std::invalid_argument)
+        {
+            setCaption(MyGUI::utility::toString(mValue));
+        }
+        catch (std::out_of_range)
         {
             setCaption(MyGUI::utility::toString(mValue));
         }