From 6a89d76321f415942872f9c4bbdbb4e7c43f49a7 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 16 Jun 2012 11:52:35 +0200
Subject: [PATCH] Issue #181: Improved script error reporting for local and
 global scripts

---
 apps/openmw/mwscript/scriptmanager.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/scriptmanager.cpp b/apps/openmw/mwscript/scriptmanager.cpp
index 6ae5064832..67414a06fd 100644
--- a/apps/openmw/mwscript/scriptmanager.cpp
+++ b/apps/openmw/mwscript/scriptmanager.cpp
@@ -11,6 +11,7 @@
 
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/context.hpp>
+#include <components/compiler/exception.hpp>
 
 #include "extensions.hpp"
 
@@ -46,8 +47,13 @@ namespace MWScript
                 if (!mErrorHandler.isGood())
                     Success = false;
             }
-            catch (...)
+            catch (const Compiler::SourceException&)
             {
+                // error has already been reported via error handler
+            }
+            catch (const std::exception& error)
+            {
+                std::cerr << "An exception has been thrown: " << error.what() << std::endl;
                 Success = false;
             }