diff --git a/source/Cosmos.Build.Windows/Builder.cs b/source/Cosmos.Build.Windows/Builder.cs
index f047150cd..701c9734e 100644
--- a/source/Cosmos.Build.Windows/Builder.cs
+++ b/source/Cosmos.Build.Windows/Builder.cs
@@ -8,7 +8,8 @@ using System.Text;
 namespace Cosmos.Build.Windows {
     public class Builder {
         //TODO: Fix this - config file? Package format?
-        protected const string mCosmosPath = @"s:\source\il2cpu\";
+        //protected const string mCosmosPath = @"s:\source\il2cpu\";
+		protected const string mCosmosPath = @"D:\dotnet\IL2ASM\repos\";
         protected string mBuildPath;
 
         public Builder() {
diff --git a/source/Cosmos/Cosmos.Shell.Console/Commands/MatthijsCommand.cs b/source/Cosmos/Cosmos.Shell.Console/Commands/MatthijsCommand.cs
index 051085d18..841fa70cd 100644
--- a/source/Cosmos/Cosmos.Shell.Console/Commands/MatthijsCommand.cs
+++ b/source/Cosmos/Cosmos.Shell.Console/Commands/MatthijsCommand.cs
@@ -28,9 +28,7 @@ namespace Cosmos.Shell.Console.Commands {
 			} catch (Exception E){
 				System.Console.WriteLine("Error Occurred while executing Command!");
 				System.Console.Write("Details: ");
-				System.Diagnostics.Debugger.Break();
-				string xMessage = E.Message;
-				System.Console.Write(E.Message);
+				System.Console.WriteLine(E.Message);
 			}
 		}
 
diff --git a/source/Indy.IL2CPU.IL.X86/Op.cs b/source/Indy.IL2CPU.IL.X86/Op.cs
index 576a46b94..56e1e8f3b 100644
--- a/source/Indy.IL2CPU.IL.X86/Op.cs
+++ b/source/Indy.IL2CPU.IL.X86/Op.cs
@@ -4,6 +4,7 @@ using Indy.IL2CPU.Assembler;
 using Indy.IL2CPU.Assembler.X86;
 using CPUx86 = Indy.IL2CPU.Assembler.X86;
 using Instruction = Mono.Cecil.Cil.Instruction;
+using Mono.Cecil.Cil;
 
 namespace Indy.IL2CPU.IL.X86 {
 	public abstract class Op: IL.Op {
@@ -15,7 +16,7 @@ namespace Indy.IL2CPU.IL.X86 {
 			//    System.Diagnostics.Debugger.Break();
 			//}
 			if (aMethodInfo != null && aMethodInfo.CurrentHandler != null) {
-				mNeedsExceptionPush = (aMethodInfo.CurrentHandler.HandlerStart != null && aMethodInfo.CurrentHandler.HandlerStart.Offset == aInstruction.Offset) || (aMethodInfo.CurrentHandler.FilterStart != null && aMethodInfo.CurrentHandler.FilterStart.Offset == aInstruction.Offset);
+				mNeedsExceptionPush = ((aMethodInfo.CurrentHandler.HandlerStart != null && aMethodInfo.CurrentHandler.HandlerStart.Offset == aInstruction.Offset) || (aMethodInfo.CurrentHandler.FilterStart != null && aMethodInfo.CurrentHandler.FilterStart.Offset == aInstruction.Offset)) && (aMethodInfo.CurrentHandler.Type == ExceptionHandlerType.Catch);
 				mNeedsExceptionClear = (aMethodInfo.CurrentHandler.HandlerEnd != null && aMethodInfo.CurrentHandler.HandlerEnd.Offset == (aInstruction.Offset + 1)) || (aMethodInfo.CurrentHandler.FilterEnd != null && aMethodInfo.CurrentHandler.FilterEnd.Offset == (aInstruction.Offset + 1));
 			}
 		}