diff --git a/src/main/java/org/springframework/hateoas/core/LinkBuilderSupport.java b/src/main/java/org/springframework/hateoas/core/LinkBuilderSupport.java
index e9259b19..e79251bc 100644
--- a/src/main/java/org/springframework/hateoas/core/LinkBuilderSupport.java
+++ b/src/main/java/org/springframework/hateoas/core/LinkBuilderSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * @author Ricardo Gladwell
  * @author Oliver Gierke
  * @author Kamill Sokol
+ * @author Kevin Conaway
  */
 public abstract class LinkBuilderSupport<T extends LinkBuilder> implements LinkBuilder {
 
@@ -45,12 +46,18 @@ public abstract class LinkBuilderSupport<T extends LinkBuilder> implements LinkB
 	 */
 	public LinkBuilderSupport(UriComponentsBuilder builder) {
 
-		Assert.notNull(builder);
+		Assert.notNull(builder, "UriComponentsBuilder must not be null!");
 		this.uriComponents = builder.build();
 	}
 
+	/**
+	 * Creates a new {@link LinkBuilderSupport} using the given {@link UriComponents}.
+	 * 
+	 * @param uriComponents must not be {@literal null}.
+	 */
 	public LinkBuilderSupport(UriComponents uriComponents) {
-		Assert.notNull(uriComponents);
+
+		Assert.notNull(uriComponents, "UriComponents must not be null!");
 		this.uriComponents = uriComponents;
 	}
 
@@ -79,8 +86,7 @@ public abstract class LinkBuilderSupport<T extends LinkBuilder> implements LinkB
 		}
 
 		String uriString = uriComponents.toUriString();
-		UriComponentsBuilder builder = uriString.isEmpty() ? fromUri(uriComponents.toUri())
-				: fromUriString(uriString);
+		UriComponentsBuilder builder = uriString.isEmpty() ? fromUri(uriComponents.toUri()) : fromUriString(uriString);
 
 		UriComponents components = UriComponentsBuilder.fromUriString(path).build();
 
diff --git a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
index de281314..90f8a9bf 100755
--- a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
+++ b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ import org.springframework.web.util.UriTemplate;
  * @author Oliver Gierke
  * @author Kamill Sokol
  * @author Greg Turnquist
+ * @author Kevin Conaway
  */
 public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuilder> {
 
@@ -60,15 +61,15 @@ public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuil
 	}
 
 	/**
-	 * Creates a new {@link ControllerLinkBuilder} using the given {@link UriComponents}.
-	 *
-	 * @param uriComponents must not be {@literal null}.
-	 */
-	ControllerLinkBuilder(UriComponents uriComponents) {
-		super(uriComponents);
-	}
-
-	/**
+	 * Creates a new {@link ControllerLinkBuilder} using the given {@link UriComponents}.
+	 *
+	 * @param uriComponents must not be {@literal null}.
+	 */
+	ControllerLinkBuilder(UriComponents uriComponents) {
+		super(uriComponents);
+	}
+
+	/**
 	 * Creates a new {@link ControllerLinkBuilder} with a base of the mapping annotated to the given controller class.
 	 * 
 	 * @param controller the class to discover the annotation on, must not be {@literal null}.
@@ -104,7 +105,7 @@ public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuil
 	 * @see org.springframework.hateoas.MethodLinkBuilderFactory#linkTo(Method, Object...)
 	 */
 	public static ControllerLinkBuilder linkTo(Method method, Object... parameters) {
-		return linkTo(method.getDeclaringClass(), method, parameters);
+		return linkTo(method.getDeclaringClass(), method, parameters);
 	}
 
 	/*
@@ -126,10 +127,10 @@ public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuil
 	 * you can create via {@link #methodOn(Class, Object...)} or {@link DummyInvocationUtils#methodOn(Class, Object...)}.
 	 * 
 	 * <pre>
-	 * @RequestMapping("/customers")
+	 * &#64;RequestMapping("/customers")
 	 * class CustomerController {
 	 * 
-	 *   @RequestMapping("/{id}/addresses")
+	 *   &#64;RequestMapping("/{id}/addresses")
 	 *   HttpEntity&lt;Addresses&gt; showAddresses(@PathVariable Long id) { … } 
 	 * }
 	 * 
diff --git a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
index d1ce4981..ba3d7a19 100644
--- a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
+++ b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,7 @@ import org.springframework.web.util.UriTemplate;
  * @author Kamill Sokol
  * @author Ross Turner
  * @author Oemer Yildiz
+ * @author Kevin Conaway
  */
 public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<ControllerLinkBuilder> {
 
@@ -156,7 +157,8 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 	 * @param invocation will never be {@literal null}.
 	 * @return
 	 */
-	protected UriComponentsBuilder applyUriComponentsContributer(UriComponentsBuilder builder, MethodInvocation invocation) {
+	protected UriComponentsBuilder applyUriComponentsContributer(UriComponentsBuilder builder,
+			MethodInvocation invocation) {
 
 		MethodParameters parameters = new MethodParameters(invocation.getMethod());
 		Iterator<Object> parameterValues = Arrays.asList(invocation.getArguments()).iterator();
@@ -235,8 +237,8 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 		protected Object verifyParameterValue(MethodParameter parameter, Object value) {
 
 			RequestParam annotation = parameter.getParameterAnnotation(RequestParam.class);
-			return annotation.required() && annotation.defaultValue().equals(ValueConstants.DEFAULT_NONE) ? super
-					.verifyParameterValue(parameter, value) : value;
+			return annotation.required() && annotation.defaultValue().equals(ValueConstants.DEFAULT_NONE)
+					? super.verifyParameterValue(parameter, value) : value;
 		}
 	}
 }
diff --git a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
index 150be794..9f8b45a4 100644
--- a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * @author Kamill Sokol
  * @author Oemer Yildiz
  * @author Greg Turnquist
+ * @author Kevin Conaway
  */
 public class ControllerLinkBuilderUnitTest extends TestUtils {
 
@@ -81,17 +82,6 @@ public class ControllerLinkBuilderUnitTest extends TestUtils {
 		assertThat(link.getHref(), endsWith("/people/15/addresses/DE"));
 	}
 
-	/**
-	 * @see #398
-	 */
-	@Test
-	public void encodesRequestParameterWithSpecialValue() {
-
-		Link link = linkTo(methodOn(ControllerWithMethods.class).methodWithRequestParam("Spring#\n")).withSelfRel();
-		assertThat(link.getRel(), is(Link.REL_SELF));
-		assertThat(link.getHref(), endsWith("/something/foo?id=Spring%23%0A"));
-	}
-
 	@Test
 	public void createsLinkToSubResource() {
 
@@ -242,7 +232,7 @@ public class ControllerLinkBuilderUnitTest extends TestUtils {
 
 		Link link = linkTo(
 				methodOn(ControllerWithMethods.class).methodWithMultiValueRequestParams("1", Arrays.asList(3, 7), 5))
-				.withSelfRel();
+						.withSelfRel();
 
 		UriComponents components = toComponents(link);
 		assertThat(components.getPath(), is("/something/1/foo"));
@@ -468,6 +458,18 @@ public class ControllerLinkBuilderUnitTest extends TestUtils {
 				.withSelfRel();
 	}
 
+	/**
+	 * @see #398
+	 */
+	@Test
+	public void encodesRequestParameterWithSpecialValue() {
+
+		Link link = linkTo(methodOn(ControllerWithMethods.class).methodWithRequestParam("Spring#\n")).withSelfRel();
+
+		assertThat(link.getRel(), is(Link.REL_SELF));
+		assertThat(link.getHref(), endsWith("/something/foo?id=Spring%23%0A"));
+	}
+
 	private static UriComponents toComponents(Link link) {
 		return UriComponentsBuilder.fromUriString(link.getHref()).build();
 	}