diff --git a/changelog.html b/changelog.html
index be3e5a98c2816d2f9dd537ef2885d2e635361945..74c45684c875042f05ff0cb367eee06a9c427aa6 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Fixed NPE in Subversion polling of Maven jobs.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11592">issue 11592</a>)
   <li class=rfe>
     CLI jar now has the version number in the manifest as well as the "-version" option.
 </ul>
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
index c2f7cd02ad7e62595ceac5df04d3cd1b68e73441..d1c5f071198fb7084ecb5c0d307b223914622683 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -165,15 +165,18 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
 
         
         mvn = mvn.forEnvironment(envs);
-        Node node = Computer.currentComputer().getNode();
-        if (node == null) {
-            log.getLogger().println("WARNING: cannot get current node: "+Computer.currentComputer());
-            return envs;
+        
+        Computer computer = Computer.currentComputer();
+        if (computer != null) { // just in case were not in a build
+            Node node = computer.getNode();
+            if (node != null) {
+                mvn = mvn.forNode(node, log);
+                
+                envs.put("M2_HOME", mvn.getHome());
+                envs.put("PATH+MAVEN", mvn.getHome() + "/bin");
+            }
         }
-        mvn = mvn.forNode(node, log);
         
-        envs.put("M2_HOME", mvn.getHome());
-        envs.put("PATH+MAVEN", mvn.getHome() + "/bin");
         return envs;
     }