diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/EmbeddedHeaderUtils.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/EmbeddedHeaderUtils.java
index 2566360ad..3eaf622e5 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/EmbeddedHeaderUtils.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/EmbeddedHeaderUtils.java
@@ -63,7 +63,7 @@ public abstract class EmbeddedHeaderUtils {
 		int headerCount = 0;
 		int headersLength = 0;
 		for (String header : headers) {
-			Object value = original.get(header) == null ? null : original.get(header);
+			Object value = original.get(header);
 			if (value != null) {
 				String json = objectMapper.toJson(value);
 				headerValues[n] = json.getBytes("UTF-8");
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/AbstractBindingLifecycle.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/AbstractBindingLifecycle.java
index 684c831bf..9841386fd 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/AbstractBindingLifecycle.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/AbstractBindingLifecycle.java
@@ -44,7 +44,7 @@ abstract class AbstractBindingLifecycle implements SmartLifecycle {
 	@Override
 	public void start() {
 		if (!running) {
-			bindables.values().stream().forEach(this::doStartWithBindable);
+			bindables.values().forEach(this::doStartWithBindable);
 			this.running = true;
 		}
 	}
@@ -52,7 +52,7 @@ abstract class AbstractBindingLifecycle implements SmartLifecycle {
 	@Override
 	public void stop() {
 		if (running) {
-			bindables.values().stream().forEach(this::doStopWithBindable);
+			bindables.values().forEach(this::doStopWithBindable);
 			this.running = false;
 		}
 	}