diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java
index 98b536998a..ccaf46308a 100644
--- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java
@@ -125,7 +125,10 @@ public class GroovyCommandMessageProcessor extends AbstractScriptExecutingMessag
 			customizerDecorator.setVariables(variables);
 		}
 		GroovyScriptFactory factory = new GroovyScriptFactory(getClass().getSimpleName(), customizerDecorator);
-		factory.setBeanClassLoader(getBeanClassLoader());
+		ClassLoader beanClassLoader = getBeanClassLoader();
+		if (beanClassLoader != null) {
+			factory.setBeanClassLoader(beanClassLoader);
+		}
 		factory.setBeanFactory(getBeanFactory());
 		try {
 			Object result = factory.getScriptedObject(scriptSource);
diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/AbstractScriptParser.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/AbstractScriptParser.java
index cd29591bab..4c5f606481 100644
--- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/AbstractScriptParser.java
+++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/AbstractScriptParser.java
@@ -64,7 +64,6 @@ public abstract class AbstractScriptParser extends AbstractSingleBeanDefinitionP
 		List<Element> variableElements = DomUtils.getChildElementsByTagName(element, "variable");
 		String scriptVariableGeneratorName = element.getAttribute("script-variable-generator");
 
-
 		if (StringUtils.hasText(scriptVariableGeneratorName) && variableElements.size() > 0) {
 			parserContext.getReaderContext().error(
 					"'script-variable-generator' and 'variable' sub-elements are mutually exclusive.", element);
@@ -72,18 +71,16 @@ public abstract class AbstractScriptParser extends AbstractSingleBeanDefinitionP
 		}
 
 		if (StringUtils.hasText(scriptLocation)) {
-			builder.addConstructorArgValue(this.resolveScriptLocation(element, parserContext.getReaderContext(),
-					scriptLocation));
+			builder.addConstructorArgValue(resolveScriptLocation(element, scriptLocation));
 		}
 		else {
 			builder.addConstructorArgValue(new StaticScriptSource(scriptText));
 		}
 
-		BeanMetadataElement scriptVariableGeneratorDef = null;
-
+		BeanMetadataElement scriptVariableGeneratorDef;
 		if (!StringUtils.hasText(scriptVariableGeneratorName)) {
-			BeanDefinitionBuilder scriptVariableGeneratorBuilder = BeanDefinitionBuilder
-					.genericBeanDefinition(DefaultScriptVariableGenerator.class);
+			BeanDefinitionBuilder scriptVariableGeneratorBuilder =
+					BeanDefinitionBuilder.genericBeanDefinition(DefaultScriptVariableGenerator.class);
 			ManagedMap<String, Object> variableMap = buildVariablesMap(element, parserContext, variableElements);
 			if (!CollectionUtils.isEmpty(variableMap)) {
 				scriptVariableGeneratorBuilder.addConstructorArgValue(variableMap);
@@ -108,7 +105,7 @@ public abstract class AbstractScriptParser extends AbstractSingleBeanDefinitionP
 	protected void postProcess(BeanDefinitionBuilder builder, Element element, ParserContext parserContext) {
 	}
 
-	private Object resolveScriptLocation(Element element, XmlReaderContext readerContext, String scriptLocation) {
+	private Object resolveScriptLocation(Element element, String scriptLocation) {
 		String refreshDelayText = element.getAttribute(REFRESH_CHECK_DELAY_ATTRIBUTE);
 		String beanClassName = RefreshableResourceScriptSource.class.getName();
 		BeanDefinitionBuilder resourceScriptSourceBuilder = BeanDefinitionBuilder.genericBeanDefinition(beanClassName);
@@ -124,6 +121,7 @@ public abstract class AbstractScriptParser extends AbstractSingleBeanDefinitionP
 
 	private ManagedMap<String, Object> buildVariablesMap(final Element element, final ParserContext parserContext,
 			List<Element> variableElements) {
+
 		@SuppressWarnings("serial")
 		ManagedMap<String, Object> variableMap = new ManagedMap<String, Object>() {