diff --git a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
index bd6950a..04d9f16 100644
--- a/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
+++ b/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
@@ -17,33 +17,34 @@
  */
 package org.apache.karaf.tooling.features;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.w3c.dom.*;
-
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.artifact.Artifact;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 /**
@@ -79,6 +80,11 @@ public class AddFeaturesToRepoMojo extends MojoSupport {
      */
     private boolean skipNonMavenProtocols = true;
 
+    /**
+     * @parameter
+     */
+    private boolean failOnArtifactResolutionError = true;
+
     public void execute() throws MojoExecutionException, MojoFailureException {
         try {
             Map<String, Feature> featuresMap = new HashMap<String, Feature>();
@@ -126,7 +132,7 @@ public class AddFeaturesToRepoMojo extends MojoSupport {
                 if (index3 > 0) {
                 	bundle = bundle.substring(0, index3);
                 }
-                              
+
                 String[] parts = bundle.substring("mvn:".length()).split("/");
                 String groupId = parts[0];
                 String artifactId = parts[1];
@@ -147,21 +153,25 @@ public class AddFeaturesToRepoMojo extends MojoSupport {
 
                 Artifact artifact;
                 try {
-                    artifact = this.factory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
+                    artifact = factory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
                     getLog().info("Copying bundle: " + bundle);
-                    resolver.resolve(artifact, this.remoteRepos, this.localRepo);
+                    resolver.resolve(artifact, remoteRepos, localRepo);
                     copy(new FileInputStream(artifact.getFile()),
                          repository,
                          name,
                          dir,
                          new byte[8192]);
                 } catch (ArtifactResolutionException e) {
+                    if (failOnArtifactResolutionError) {
+                        throw new MojoFailureException("Can't resolve bundle " + bundle, e);
+                    }
                     getLog().error("Can't resolve bundle " + bundle, e);
                 } catch (ArtifactNotFoundException e) {
+                    if (failOnArtifactResolutionError) {
+                        throw new MojoFailureException("Can't resolve bundle " + bundle, e);
+                    }
                     getLog().error("Can't resolve bundle " + bundle, e);
                 }
-
-
             }
         } catch (MojoExecutionException e) {
             throw e;