diff --git a/nsis/plugin.jelly b/nsis/plugin.jelly
index 74066634..079dc091 100644
--- a/nsis/plugin.jelly
+++ b/nsis/plugin.jelly
@@ -21,7 +21,6 @@
 <project 
   xmlns:j="jelly:core"
   xmlns:ant="jelly:ant"
-  xmlns:dist="dist"
   xmlns:license="license"
   xmlns:maven="jelly:maven"
   xmlns:util="jelly:util">
@@ -77,6 +76,10 @@
   
     <j:set var="script" value="${maven.build.dir}/setup.nsi"/>
 
+    <util:file var="nsisExeFile" name="${maven.nsis.exe}" />
+    <j:if test="${!nsisExeFile.exists()}">
+      <fail>The NSIS executable '${maven.nsis.exe}' could not be found</fail>
+    </j:if>
     <maven:get var="maven.dist.dir" plugin="maven-dist-plugin" property="maven.dist.dir"/>
     <mkdir dir="${maven.dist.dir}"/>
     <!-- call makensis.exe with the setup.nsi file -->
diff --git a/nsis/xdocs/changes.xml b/nsis/xdocs/changes.xml
index 63d90a79..9cb3158d 100644
--- a/nsis/xdocs/changes.xml
+++ b/nsis/xdocs/changes.xml
@@ -26,6 +26,7 @@
   <body>
   
     <release version="1.2-SNAPSHOT" date="Unreleased">
+      <action dev="dion" type="fix" due-to="Geoffrey">Check maven.nsis.exe exists before using it.</action>
       <action dev="dion" type="add" due-to="Geoffrey">Add faq</action>
       <action dev="dion" type="update">
         Add back license to project.xml after the scm plugin removed it.
