diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
index 49c7c2f9c3..f12c948090 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
@@ -30,7 +30,7 @@ public class PropertiesBasedMetadataPersister implements MetadataPersister<Strin
     /**
      * Used to queue the writes asynchronously
      */
-    private Executor executor;
+    private Executor executor = new SimpleAsyncTaskExecutor();
 
     /**
      * Used to encapsulate acquisition of a {@link java.util.Properties} instance if it's prefered that we handled it on the client's behalf
@@ -117,6 +117,8 @@ public class PropertiesBasedMetadataPersister implements MetadataPersister<Strin
     }
 
     public void write(String key, String value) {
+        Assert.notNull( key != null , "key can't be null");
+        Assert.notNull( value != null , "value can't be null");
         synchronized (monitor) {
             long now = System.nanoTime();
             this.properties.setProperty(key, value);