diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index ff62f78..e1f80a3 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+== 2.38
+
+- Fix NPE in Repository Policy retreival
+- Fix distribution management snapshot repository load (Ricardo Caldeira <rikycaldeira@outlook.com>)
+
 == 2.37
 
 - Drop maven-compat and update dependendies
diff --git a/README.adoc b/README.adoc
index d9f8776..7bc27f1 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-= Tiles Maven Plugin - Version 2.37
+= Tiles Maven Plugin - Version 2.38
 
 image:https://travis-ci.org/repaint-io/maven-tiles.svg[caption="Travis Build Status"] image:https://badges.gitter.im/repaint-io/maven-tiles.svg[link="https://gitter.im/repaint-io/maven-tiles?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 
@@ -63,7 +63,7 @@ you specify a configuration.
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.37</version>
+        <version>2.38</version>
         <extensions>true</extensions>
         <configuration>
           <filtering>false</filtering>
diff --git a/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy b/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy
index 6cb0a0a..678564c 100644
--- a/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy
+++ b/src/main/groovy/io/repaint/maven/tiles/TilesMavenLifecycleParticipant.groovy
@@ -89,7 +89,8 @@ import static io.repaint.maven.tiles.GavUtil.artifactName
 import static io.repaint.maven.tiles.GavUtil.modelGav
 import static io.repaint.maven.tiles.GavUtil.modelRealGa
 import static io.repaint.maven.tiles.GavUtil.parentGav
-
+import static org.apache.maven.artifact.repository.ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN
+import static org.apache.maven.artifact.repository.ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS
 /**
  * Fetches all dependencies defined in the POM `configuration`.
  *
@@ -343,8 +344,12 @@ class TilesMavenLifecycleParticipant extends AbstractMavenLifecycleParticipant {
 	}
 
 	ArtifactRepositoryPolicy getArtifactRepositoryPolicy(RepositoryPolicy policy) {
-		return new ArtifactRepositoryPolicy(Boolean.valueOf(policy.enabled),
-				policy.updatePolicy, policy.checksumPolicy)
+		if (policy != null) {
+			return new ArtifactRepositoryPolicy(policy.isEnabled(), policy.updatePolicy, policy.checksumPolicy)
+		} else {
+			return new ArtifactRepositoryPolicy(true, UPDATE_POLICY_ALWAYS, CHECKSUM_POLICY_WARN)
+		}
+
 	}
 
 	/**