diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index d3e0f3b9245de67aa5104392ab989bb29d1b3cf4..13a51cbba72a79ca41093fe5ad6ece94f73e6d67 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -20,7 +20,7 @@ die() {
 	echo '-----------------------' 1>&2
 	echo '' 1>&2
 	echo "$@" 1>&2
-	exit 1
+	return
 }
 
 zero='0000000000000000000000000000000000000000'
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
index acb324e29b7345f4fec7a7272e52122c9a046aa1..4e093adaa2859814b7ee12a957b9c0c593f176d9 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
@@ -773,7 +773,7 @@ template< Q_state Q, AnalMode MODE, CnvrtUnits CONV >
 class LOOP_ND{
   public:
     static inline void EXEC(ConvertToMDEvents *pH){
-            LOOP_ND<Q, MODE,CnvrtUnits(int(CONV)-1)>::EXEC(pH);
+            LOOP_ND<Q, MODE,static_cast<CnvrtUnits>(static_cast<int>(CONV)-1)>::EXEC(pH);
         
             std::string Key = pH->Q_modes[Q]+pH->dE_modes[MODE]+pH->ConvModes[CONV];