diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index de93628c..1b3b0f24 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -187,22 +187,28 @@
         <j:set var="remoteFile"
           value="${repo}/${groupId}/plugins/${artifactId}-${version}.jar" />
         <echo>trying to download ${remoteFile}</echo>
-        <j:invokeStatic var="dummy" method="getFile" 
-          className="org.apache.maven.util.HttpUtils">
-          <j:arg type="java.lang.String" value="${remoteFile}" />
-          <j:arg type="java.io.File" value="${localPlugin}"/>
-          <j:arg type="boolean" value="false"/>
-          <j:arg type="boolean" value="true"/>
-          <j:arg type="java.lang.String" value="${maven.proxy.host}" />
-          <j:arg type="java.lang.String" value="${maven.proxy.port}" />
-          <j:arg type="java.lang.String" value="${maven.proxy.username}" />
-          <j:arg type="java.lang.String" value="${maven.proxy.password}" />
-          <j:arg type="boolean" value="false"/>
-        </j:invokeStatic>
+        <j:catch var="ex">
+          <j:invokeStatic var="dummy" method="getFile" 
+            className="org.apache.maven.util.HttpUtils">
+            <j:arg type="java.lang.String" value="${remoteFile}" />
+            <j:arg type="java.io.File" value="${localPlugin}"/>
+            <j:arg type="boolean" value="false"/>
+            <j:arg type="boolean" value="true"/>
+            <j:arg type="java.lang.String" value="${maven.proxy.host}" />
+            <j:arg type="java.lang.String" value="${maven.proxy.port}" />
+            <j:arg type="java.lang.String" value="${maven.proxy.username}" />
+            <j:arg type="java.lang.String" value="${maven.proxy.password}" />
+            <j:arg type="boolean" value="false"/>
+          </j:invokeStatic>
+        </j:catch>
       </j:if>
+      <j:break test="${localPlugin.exists()}"/>
     </j:forEach>
     
     <j:set var="downloaded" value="${localPlugin.exists()}"/>
+    <j:if test="${!downloaded}">
+      <ant:fail message="Unable to find plug-in" />    
+    </j:if>
     <j:if test="${downloaded}">
       <echo>Plugin downloaded, removing other versions</echo>
       <delete verbose="false">