diff --git a/README.txt b/README.txt
index a46c2e1d6d..c2bcfb013c 100644
--- a/README.txt
+++ b/README.txt
@@ -15,7 +15,7 @@ Initial Setup
 
 Using Eclipse
  - Import projects as Maven projects ("Import > Maven > Existing Maven Projects")
- - Browse to the code directory of your project and DO NOT select the parent pom.xml (Select just "rm-server/pom.xml" and "rm-share/pom.xml")
+ - Browse to the code directory of your project and select "rm-server/pom.xml" and "rm-share/pom.xml". DO NOT select the parent "/pom.xml"
  - Open the Ant view and add the build files for both modules ("build.xml")
  - Run the "prepareEnv" targets for both modules which will prepare the development environment. This target must be run just once.
  - Now "buildAndDeploy" target can be run which will create the amp file, apply it to the war file and copy the war file to webapps folder.
diff --git a/build.xml b/build.xml
index 79d901b08c..547c2364fa 100644
--- a/build.xml
+++ b/build.xml
@@ -9,24 +9,24 @@
    <property environment="env" />
 
    <target name="cleanTarget">
-      <delete dir="${mvn.build.directory}" />
+      <delete dir="${mvn.build.directory}" failonerror="true" />
    </target>
 
    <target name="install" depends="cleanTarget, updateClassPath">
-      <exec executable="${mvn.exec}">
+      <exec executable="${mvn.exec}" failonerror="true">
          <arg value="install" />
          <arg value="-DskipTests" />
       </exec>
    </target>
 
    <target name="updateClassPath">
-      <exec executable="${mvn.exec}">
+      <exec executable="${mvn.exec}" failonerror="true">
          <arg value="eclipse:eclipse" />
       </exec>
    </target>
 
    <target name="fetchWarFile">
-      <exec executable="${mvn.exec}">
+      <exec executable="${mvn.exec}" failonerror="true">
          <arg value="dependency:get" />
          <arg value="-DgroupId=${app.war.groupId}" />
          <arg value="-DartifactId=${app.war.artifactId}" />
@@ -37,40 +37,40 @@
    </target>
 
    <target name="deleteWarFile">
-      <delete file="${app.package.path}" />
+      <delete file="${app.package.path}" failonerror="true" />
    </target>
 
    <target name="deleteExplodedWar">
-      <delete dir="${app.folder}"/>
+      <delete dir="${app.folder}" failonerror="true" />
    </target>
 
    <target name="alfresco:amp" depends="install">
-      <exec executable="${mvn.exec}">
+      <exec executable="${mvn.exec}" failonerror="true">
          <arg value="alfresco:amp" />
       </exec>
    </target>
 
    <target name="alfresco:install" depends="deleteWarFile, deleteExplodedWar, alfresco:amp, fetchWarFile">
-      <exec executable="${mvn.exec}">
+      <exec executable="${mvn.exec}" failonerror="true">
          <arg value="alfresco:install" />
       </exec>
    </target>
 
    <target name="copyWarFileToTomcat">
-      <copy file="${mvn.build.directory}/${app.package}" todir="${app.tomcat.webapps}"/>
+      <copy file="${mvn.build.directory}/${app.package}" todir="${app.tomcat.webapps}" failonerror="true" />
    </target>
 
    <target name="buildAndDeploy" depends="alfresco:install, copyWarFileToTomcat" description=""/>
 
    <target name="tomcat-start" description="">
-      <exec executable="${bash.exec}">
+      <exec executable="${bash.exec}" failonerror="true">
          <arg value="${catalina.exec}"/>
          <arg value="run"/>
       </exec>
    </target>
 
    <target name="tomcat-start-debug" description="">
-      <exec executable="${bash.exec}">
+      <exec executable="${bash.exec}" failonerror="true">
          <arg value="${catalina.exec}"/>
          <arg value="jpda"/>
          <arg value="run"/>
@@ -78,14 +78,14 @@
    </target>
 
    <target name="tomcat-stop" description="">
-      <exec executable="${bash.exec}">
+      <exec executable="${bash.exec}" failonerror="true">
          <arg value="${catalina.exec}"/>
          <arg value="stop"/>
       </exec>
    </target>
 
    <target name="assembleLocalisationPackage" description="">
-      <copy todir="${mvn.build.directory}/i18n/${ant.project.name}/${mvn.resources.directory}">
+      <copy todir="${mvn.build.directory}/i18n/${ant.project.name}/${mvn.resources.directory}" failonerror="true">
          <fileset dir="${mvn.resources.directory}">
             <include name="**/*.properties" />
             <exclude name="**/*_*.properties" />
@@ -99,7 +99,7 @@
    </target>
 
    <target name="assembleIconPackage" description="">
-      <copy todir="${mvn.build.directory}/icons/${ant.project.name}/${mvn.resources.directory}">
+      <copy todir="${mvn.build.directory}/icons/${ant.project.name}/${mvn.resources.directory}" failonerror="true">
          <fileset dir="${mvn.resources.directory}">
             <include name="**/*.png"/>
          </fileset>
diff --git a/rm-server/build.xml b/rm-server/build.xml
index 44d44f1dc3..621153ce72 100644
--- a/rm-server/build.xml
+++ b/rm-server/build.xml
@@ -8,7 +8,7 @@
    <property file="build.properties" />
 
    <target name="copyDBDriver">
-      <exec executable="${mvn.exec}">
+      <exec executable="${mvn.exec}" failonerror="true">
          <arg value="dependency:get" />
          <arg value="-DgroupId=${db.driver.groupId}" />
          <arg value="-DartifactId=${db.driver.artifactId}" />
@@ -20,8 +20,8 @@
 
    <target name="copyDevContextFile">
       <property name="devContextFile" value="../root/projects/repository/config/alfresco/extension/dev-context.xml" />
-      <copy file="${devContextFile}" todir="${app.tomcat.folder}/shared/classes/alfresco/extension"/>
-      <copy file="${devContextFile}" todir="src/main/resources/alfresco/extension"/>
+      <copy file="${devContextFile}" todir="${app.tomcat.folder}/shared/classes/alfresco/extension" failonerror="true" />
+      <copy file="${devContextFile}" todir="src/main/resources/alfresco/extension" failonerror="true" />
    </target>
 
    <target name="prepareEnv" depends="updateClassPath, copyDBDriver, copyDevContextFile" description="" />