diff --git a/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java b/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java
index 6b52f57..dc692d6 100644
--- a/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java
+++ b/src/main/java/org/jenkinsci/lib/envinject/EnvInjectAction.java
@@ -130,11 +130,8 @@ private Object writeReplace() throws ObjectStreamException {
         try {
             EnvInjectSavable dao = new EnvInjectSavable();
 
-            Map<String, String> toWrite = getEnvMap();
-            if (toWrite == null) {
-                toWrite = Collections.<String, String>emptyMap();
-            }
-
+            Map<String, String> toWrite = envMap != null ? envMap : Collections.<String, String>emptyMap();
+            
             if (rootDir == null) {
                 dao.saveEnvironment(build.getRootDir(), Maps.transformEntries(toWrite,
                         new Maps.EntryTransformer<String, String, String>() {