diff --git a/maven-artifact-manager/pom.xml b/maven-artifact-manager/pom.xml
index 2fb9363bca..857f951479 100644
--- a/maven-artifact-manager/pom.xml
+++ b/maven-artifact-manager/pom.xml
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
index 24adeed74d..0631ff6b7b 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
@@ -33,6 +33,8 @@
 import java.util.List;
 
 /**
+ * Manages <a href="http://maven.apache.org/wagon">Wagon</a> related operations in Maven.
+ * 
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
  * @version $Id$
  */
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
index 50dca89c5b..352112d9b4 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -156,13 +156,11 @@ private void mergeMetadata( RepositoryMetadata metadata, List remoteRepositories
             ArtifactRepositoryPolicy policy =
                 metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
 
-            if ( policy.isEnabled() && !repository.isBlacklisted() )
+            if ( ( policy.isEnabled() && !repository.isBlacklisted() )
+                && ( loadMetadata( metadata, repository, localRepository, previousMetadata ) ) )
             {
-                if ( loadMetadata( metadata, repository, localRepository, previousMetadata ) )
-                {
-                    metadata.setRepository( repository );
-                    selected = repository;
-                }
+                metadata.setRepository( repository );
+                selected = repository;
             }
         }
         if ( loadMetadata( metadata, localRepository, localRepository, previousMetadata ) )
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
index 06ba26384f..9bcf34157d 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
@@ -159,12 +159,10 @@ private int resolveLatestSnapshotBuildNumber( Artifact artifact, ArtifactReposit
 
         int buildNumber = 0;
         Metadata repoMetadata = metadata.getMetadata();
-        if ( repoMetadata != null )
+        if ( ( repoMetadata != null )
+            && ( repoMetadata.getVersioning() != null && repoMetadata.getVersioning().getSnapshot() != null ) )
         {
-            if ( repoMetadata.getVersioning() != null && repoMetadata.getVersioning().getSnapshot() != null )
-            {
-                buildNumber = repoMetadata.getVersioning().getSnapshot().getBuildNumber();
-            }
+            buildNumber = repoMetadata.getVersioning().getSnapshot().getBuildNumber();
         }
         return buildNumber;
     }