diff --git a/README.adoc b/README.adoc
index 678a21a..40e13a6 100644
--- a/README.adoc
+++ b/README.adoc
@@ -12,7 +12,7 @@ This module provides infrastructure components to build repository abstractions
 
 == Code of Conduct
 
-This project is governed by the https://github.com/spring-projects/.github/CODE_OF_CONDUCT.adoc[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+This project is governed by the https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
 == Getting Started
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java b/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java
index e8d3317..800c548 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java
@@ -95,7 +95,7 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 	 */
 	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
 
-		Assert.notNull(exceptionTranslator, "ExceptionTranslator must not be null.");
+		Assert.notNull(exceptionTranslator, "ExceptionTranslator must not be null!");
 		this.exceptionTranslator = exceptionTranslator;
 	}
 
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java
index 3ff94ab..ea2b779 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java
@@ -54,8 +54,8 @@ abstract class KeyValueQuerydslUtils {
 	 */
 	static OrderSpecifier<?>[] toOrderSpecifier(Sort sort, PathBuilder<?> builder) {
 
-		Assert.notNull(sort, "Sort must not be null.");
-		Assert.notNull(builder, "Builder must not be null.");
+		Assert.notNull(sort, "Sort must not be null!");
+		Assert.notNull(builder, "Builder must not be null!");
 
 		List<OrderSpecifier<?>> specifiers = null;
 
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValueRepository.java b/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValueRepository.java
index aae970f..cbd33f0 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValueRepository.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValueRepository.java
@@ -96,7 +96,7 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 	@Override
 	public Optional<T> findOne(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(predicate, "Predicate must not be null!");
 
 		try {
 			return Optional.ofNullable(prepareQuery(predicate).fetchOne());
@@ -112,7 +112,7 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 	@Override
 	public Iterable<T> findAll(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(predicate, "Predicate must not be null!");
 
 		return prepareQuery(predicate).fetchResults().getResults();
 	}
@@ -124,8 +124,8 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 	@Override
 	public Iterable<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
-		Assert.notNull(orders, "OrderSpecifiers must not be null");
+		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(orders, "OrderSpecifiers must not be null!");
 
 		AbstractCollQuery<T, ?> query = prepareQuery(predicate);
 		query.orderBy(orders);
@@ -140,8 +140,8 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 	@Override
 	public Iterable<T> findAll(Predicate predicate, Sort sort) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
-		Assert.notNull(sort, "Sort must not be null");
+		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(sort, "Sort must not be null!");
 
 		return findAll(predicate, toOrderSpecifier(sort, builder));
 	}
@@ -153,8 +153,8 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 	@Override
 	public Page<T> findAll(Predicate predicate, Pageable pageable) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
-		Assert.notNull(pageable, "Pageable must not be null");
+		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(pageable, "Pageable must not be null!");
 
 		AbstractCollQuery<T, ?> query = prepareQuery(predicate);
 
@@ -178,7 +178,7 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 	@Override
 	public Iterable<T> findAll(OrderSpecifier<?>... orders) {
 
-		Assert.notNull(orders, "OrderSpecifiers must not be null");
+		Assert.notNull(orders, "OrderSpecifiers must not be null!");
 
 		if (ObjectUtils.isEmpty(orders)) {
 			return findAll();
@@ -197,7 +197,7 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 	@Override
 	public long count(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(predicate, "Predicate must not be null!");
 
 		return prepareQuery(predicate).fetchCount();
 	}
@@ -209,7 +209,7 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 	@Override
 	public boolean exists(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(predicate, "Predicate must not be null!");
 
 		return count(predicate) > 0;
 	}
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
index de84ce9..f26bae6 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
@@ -114,7 +114,7 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 	@Override
 	public <S extends T> Iterable<S> saveAll(Iterable<S> entities) {
 
-		Assert.notNull(entities, "The given Iterable of entities must not be null");
+		Assert.notNull(entities, "The given Iterable of entities must not be null!");
 
 		List<S> saved = new ArrayList<>();
 
@@ -132,7 +132,7 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 	@Override
 	public Optional<T> findById(ID id) {
 
-		Assert.notNull(id, "The given id must not be null");
+		Assert.notNull(id, "The given id must not be null!");
 
 		return operations.findById(id, entityInformation.getJavaType());
 	}
@@ -162,7 +162,7 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 	@Override
 	public Iterable<T> findAllById(Iterable<ID> ids) {
 
-		Assert.notNull(ids, "The given Iterable of id's must not be null");
+		Assert.notNull(ids, "The given Iterable of id's must not be null!");
 
 		List<T> result = new ArrayList<>();
 
@@ -187,7 +187,7 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 	@Override
 	public void deleteById(ID id) {
 
-		Assert.notNull(id, "The given id must not be null");
+		Assert.notNull(id, "The given id must not be null!");
 
 		operations.delete(id, entityInformation.getJavaType());
 	}
@@ -199,7 +199,7 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 	@Override
 	public void delete(T entity) {
 
-		Assert.notNull(entity, "The given entity must not be null");
+		Assert.notNull(entity, "The given entity must not be null!");
 
 		deleteById(entityInformation.getRequiredId(entity));
 	}
@@ -211,7 +211,7 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 	@Override
 	public void deleteAll(Iterable<? extends T> entities) {
 
-		Assert.notNull(entities, "The given Iterable of entities must not be null");
+		Assert.notNull(entities, "The given Iterable of entities must not be null!");
 
 		entities.forEach(this::delete);
 	}
diff --git a/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java b/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
index f1a5157..e17f701 100644
--- a/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
+++ b/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
@@ -188,7 +188,7 @@ public class MapKeyValueAdapter extends AbstractKeyValueAdapter {
 	 */
 	protected Map<Object, Object> getKeySpaceMap(String keyspace) {
 
-		Assert.notNull(keyspace, "Collection must not be null for lookup.");
+		Assert.notNull(keyspace, "Collection must not be null for lookup!");
 		return store.computeIfAbsent(keyspace, k -> CollectionFactory.createMap(keySpaceMapType,  1000));
 	}