diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
index 3c267c6c42bca808c87b0e8d9eb18564ecb08654..12e8635934212ed136606b10c7b7468f4c8ebe2c 100755
--- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
+++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
@@ -221,7 +221,7 @@ public final class MavenArtifact implements Serializable {
      */
     public void archive(MavenBuildProxy build, File file, BuildListener listener) throws IOException, InterruptedException {
         if (build.isArchivingDisabled()) {
-            listener.getLogger().println("[JENKINS] Archiving disabled - not archiving " + file);
+            LOGGER.fine("Archiving disabled - not archiving " + file);
         }
         else {
             FilePath target = getArtifactArchivePath(build,groupId,artifactId,version);
diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java
index ec282d0dda0bc32bf056d209f19c9dca5a0c755a..0068585771b9d15bc2d74cb2d1f6bec9fb2e0f56 100644
--- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java
+++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java
@@ -153,19 +153,16 @@ public class MavenArtifactArchiver extends MavenReporter {
         // do we have any assembly artifacts?
 //        System.out.println("Considering "+assemblies+" at "+MavenArtifactArchiver.this);
 //        new Exception().fillInStackTrace().printStackTrace();
-        if (assemblies!=null) {
+        if (build.isArchivingDisabled()) {
+          listener.getLogger().println("[JENKINS] Archiving disabled");
+        } else if (assemblies!=null) {
             for (File assembly : assemblies) {
                 if(mavenArtifacts.contains(assembly))
                     continue;   // looks like this is already archived
-                if (build.isArchivingDisabled()) {
-                    listener.getLogger().println("[JENKINS] Archiving disabled - not archiving " + assembly);
-                }
-                else {
-                    FilePath target = build.getArtifactsDir().child(assembly.getName());
-                    listener.getLogger().println("[JENKINS] Archiving "+ assembly+" to "+target);
-                    new FilePath(assembly).copyTo(target);
-                    // TODO: fingerprint
-                }
+                FilePath target = build.getArtifactsDir().child(assembly.getName());
+                listener.getLogger().println("[JENKINS] Archiving "+ assembly+" to "+target);
+                new FilePath(assembly).copyTo(target);
+                // TODO: fingerprint
             }
         }