diff --git a/build.gradle b/build.gradle
index 9a08634..491d1df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,5 +51,5 @@ publishing {
     }
 
     group 'mil.army.usace.hec'
-    version '0.0.46'
+    version '0.0.47'
 }
diff --git a/src/main/java/usace/cc/plugin/Action.java b/src/main/java/usace/cc/plugin/Action.java
index 243cb3f..5176902 100644
--- a/src/main/java/usace/cc/plugin/Action.java
+++ b/src/main/java/usace/cc/plugin/Action.java
@@ -21,8 +21,11 @@ public Map<String,DataSource> getParameters(){
         return parameters;
     }
     public void UpdateActionPaths(){
-        for(Map.Entry<String, DataSource> apb : parameters.entrySet()){
-            parameters.replace(apb.getKey(),apb.getValue().UpdatePaths());
+        if(parameters!=null){
+            for(Map.Entry<String, DataSource> apb : parameters.entrySet()){
+                parameters.replace(apb.getKey(),apb.getValue().UpdatePaths());
+            }            
         }
+
     }
 }
diff --git a/src/main/java/usace/cc/plugin/DataSource.java b/src/main/java/usace/cc/plugin/DataSource.java
index 2e2f4d3..c3f8f65 100644
--- a/src/main/java/usace/cc/plugin/DataSource.java
+++ b/src/main/java/usace/cc/plugin/DataSource.java
@@ -29,15 +29,20 @@ public String getStoreName(){
     public DataSource UpdatePaths(){
         DataSource dest = this;
         PluginManager pm = PluginManager.getInstance();
-        
-        for(int j=0; j<this.getPaths().length;j++){
-            pm.LogMessage(new Message("incoming: " + this.getPaths()[j]));
-            dest.getPaths()[j] = pm.SubstitutePath(this.getPaths()[j]);
-            pm.LogMessage(new Message("outgoing: " + dest.getPaths()[j]));
+        if(this.getPaths()!=null){
+            for(int j=0; j<this.getPaths().length;j++){
+                pm.LogMessage(new Message("incoming: " + this.getPaths()[j]));
+                dest.getPaths()[j] = pm.SubstitutePath(this.getPaths()[j]);
+                pm.LogMessage(new Message("outgoing: " + dest.getPaths()[j]));
+            }            
         }
-        for(int j=0; j<this.getDataPaths().length;j++){
-            dest.getDataPaths()[j] = pm.SubstitutePath(this.getDataPaths()[j]);
+
+        if (this.getDataPaths()!=null){
+            for(int j=0; j<this.getDataPaths().length;j++){
+                dest.getDataPaths()[j] = pm.SubstitutePath(this.getDataPaths()[j]);
+            }            
         }
+
         return dest;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/usace/cc/plugin/PluginManager.java b/src/main/java/usace/cc/plugin/PluginManager.java
index ec752f6..d05b7fd 100644
--- a/src/main/java/usace/cc/plugin/PluginManager.java
+++ b/src/main/java/usace/cc/plugin/PluginManager.java
@@ -53,15 +53,22 @@ private PluginManager(){
         
     }
     private void substitutePathVariables() {
-        for (int i= 0; i<_payload.getInputs().length; i++){
-            _payload.getInputs()[i] = _payload.getInputs()[i].UpdatePaths();
+        if (_payload.getInputs()!=null){
+            for (int i= 0; i<_payload.getInputs().length; i++){
+                _payload.getInputs()[i] = _payload.getInputs()[i].UpdatePaths();
+            }            
         }
-        for (int i= 0; i<_payload.getOutputs().length; i++){
-            _payload.getOutputs()[i] = _payload.getOutputs()[i].UpdatePaths();
+        if (_payload.getOutputs()!=null){
+            for (int i= 0; i<_payload.getOutputs().length; i++){
+                _payload.getOutputs()[i] = _payload.getOutputs()[i].UpdatePaths();
+            }            
         }
-        for (int i= 0; i<_payload.getActions().length; i++){
-            _payload.getActions()[i].UpdateActionPaths();
+        if(_payload.getActions()!=null){
+            for (int i= 0; i<_payload.getActions().length; i++){
+                _payload.getActions()[i].UpdateActionPaths();
+            }            
         }
+
     }
     public String SubstitutePath(String path) {
         Matcher m = p.matcher(path);