diff --git a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
index 0bcaf476..fc9fa53b 100755
--- a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
+++ b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
@@ -79,13 +79,8 @@ public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuil
 
 		ControllerLinkBuilder builder = new ControllerLinkBuilder(getBuilder());
 		String mapping = DISCOVERER.getMapping(controller);
+		UriTemplate template = new UriTemplate(mapping == null ? "/" : mapping);
 
-		if (mapping == null) {
-			throw new IllegalArgumentException(
-					String.format("No mapping found on controller class %s!", controller.getName()));
-		}
-
-		UriTemplate template = new UriTemplate(mapping);
 		return builder.slash(template.expand(parameters));
 	}
 
diff --git a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
index c74adeeb..6223dfde 100644
--- a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
@@ -81,9 +81,11 @@ public class ControllerLinkBuilderUnitTest extends TestUtils {
 		linkTo(InvalidController.class);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void createsLinkToUnmappedController() {
-		linkTo(UnmappedController.class);
+
+		Link link = linkTo(UnmappedController.class).withSelfRel();
+		assertThat(link.getHref(), is("http://localhost"));
 	}
 
 	@Test