Ensure correct sender in uncaught exception handler

Author: PseudoKnight

src/main/java/com/laytonsmith/core/constructs/CClosure.java

@@ -303,6 +303,7 @@ protected void execute(Mixed... values) throws ConfigRuntimeException, ProgramFl
 			} catch (CancelCommandException e) {
 				// die()
 			} catch (ConfigRuntimeException ex) {
+				ex.setEnv(environment);
 				if(ex instanceof AbstractCREException) {
 					((AbstractCREException) ex).freezeStackTraceElements(stManager);
 				}

src/main/java/com/laytonsmith/core/exceptions/ConfigRuntimeException.java

@@ -115,6 +115,8 @@ public static Reaction GetReaction(ConfigRuntimeException e, Environment env) {
 			if(e.getEnv() != null) {
 				MCCommandSender sender = e.getEnv().getEnv(CommandHelperEnvironment.class).GetCommandSender();
 				c.getEnv().getEnv(CommandHelperEnvironment.class).SetCommandSender(sender);
+			} else {
+				c.getEnv().getEnv(CommandHelperEnvironment.class).SetCommandSender(null);
 			}
 			try {
 				Mixed ret = c.executeCallable(env, Target.UNKNOWN, new Mixed[]{ex});