diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java
index 71a0fd7a4..f11c881ee 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java
@@ -298,42 +298,49 @@ public abstract class AbstractComposableFunctionRegistry implements FunctionRegi
 	}
 
 	private Object compose(String name, Map<String, Object> lookup) {
+
 		name = normalizeName(name);
 		Object composedFunction = null;
+
 		if (lookup.containsKey(name)) {
 			composedFunction = lookup.get(name);
 		}
+		else if (name.equals("") && lookup.size() == 1) {
+			composedFunction = lookup.values().iterator().next();
+		}
 		else {
-			if (name.equals("") && lookup.size() == 1) {
-				composedFunction = lookup.values().iterator().next();
-			}
-			else {
-				String[] stages = StringUtils.delimitedListToStringArray(name, "|");
-				if (Stream.of(stages).allMatch(funcName -> contains(funcName))) {
-					List<FunctionRegistration<?>> composableFunctions = Stream.of(stages)
-							.map(funcName -> find(funcName)).collect(Collectors.toList());
-					FunctionRegistration<?> composedRegistration = composableFunctions
-							.stream().reduce((a, z) -> composeFunctions(a, z))
-							.orElseGet(() -> null);
-					if (composedRegistration != null) {
-						composedFunction = composedRegistration.getTarget();
-						if (composedFunction != null && !this.types.containsKey(name)) {
-							this.addType(name, composedRegistration.getType());
-							this.addName(composedFunction, name);
-							if (composedFunction instanceof Function) {
-								this.addFunction(name, (Function<?, ?>) composedFunction);
-							}
-							else if (composedFunction instanceof Consumer) {
-								this.addConsumer(name, (Consumer<?>) composedFunction);
-							}
-							else if (composedFunction instanceof Supplier) {
-								this.addSupplier(name, (Supplier<?>) composedFunction);
-							}
-						}
+
+			String[] stages = StringUtils.delimitedListToStringArray(name, "|");
+			if (Stream.of(stages).allMatch(funcName -> contains(funcName))) {
+
+				List<FunctionRegistration<?>> composableFunctions = Stream.of(stages)
+						.map(funcName -> find(funcName)).collect(Collectors.toList());
+				FunctionRegistration<?> composedRegistration = composableFunctions
+						.stream().reduce((a, z) -> composeFunctions(a, z))
+						.orElseGet(() -> null);
+
+				if (composedRegistration != null
+						&& composedRegistration.getTarget() != null
+						&& !this.types.containsKey(name)) {
+
+					composedFunction = composedRegistration.getTarget();
+					this.addType(name, composedRegistration.getType());
+					this.addName(composedFunction, name);
+					if (composedFunction instanceof Function) {
+						this.addFunction(name, (Function<?, ?>) composedFunction);
+					}
+					else if (composedFunction instanceof Consumer) {
+						this.addConsumer(name, (Consumer<?>) composedFunction);
+					}
+					else if (composedFunction instanceof Supplier) {
+						this.addSupplier(name, (Supplier<?>) composedFunction);
+
 					}
 				}
+
 			}
 		}
+
 		return composedFunction;
 	}
 
diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java
index 1418c070e..a44378873 100644
--- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java
+++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/MessageFunctionTests.java
@@ -67,7 +67,8 @@ public class MessageFunctionTests {
 	@Test
 	public void fluxToMonoFunction() {
 		MessageFunction function = new MessageFunction(
-				new FluxToMonoFunction<>(flux -> flux.next().map(uppercase())));
+				new FluxToMonoFunction<String, String>(
+						flux -> flux.next().map(uppercase())));
 		Publisher<Message<?>> result = function.apply(Flux
 				.just(MessageBuilder.withPayload("foo").setHeader("foo", "bar").build()));
 		StepVerifier.create(result).assertNext(message -> {
@@ -79,7 +80,8 @@ public class MessageFunctionTests {
 	@Test
 	public void monoToFunction() {
 		MessageFunction function = new MessageFunction(
-				new MonoToFluxFunction<>(mono -> Flux.from(mono.map(uppercase()))));
+				new MonoToFluxFunction<String, String>(
+						mono -> Flux.from(mono.map(uppercase()))));
 		Publisher<Message<?>> result = function.apply(Flux
 				.just(MessageBuilder.withPayload("foo").setHeader("foo", "bar").build()));
 		StepVerifier.create(result).assertNext(message -> {