diff --git a/src/main/java/org/springframework/hateoas/UriTemplate.java b/src/main/java/org/springframework/hateoas/UriTemplate.java
index 0ce8951b..8f6466d3 100644
--- a/src/main/java/org/springframework/hateoas/UriTemplate.java
+++ b/src/main/java/org/springframework/hateoas/UriTemplate.java
@@ -89,7 +89,7 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
 	 */
 	public UriTemplate(String baseUri, TemplateVariables variables) {
 
-		Assert.hasText("Base URI must not be null or empty!");
+		Assert.hasText(baseUri,"Base URI must not be null or empty!");
 
 		this.baseUri = baseUri;
 		this.variables = variables == null ? TemplateVariables.NONE : variables;
diff --git a/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java b/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java
index 3de32feb..6b941394 100644
--- a/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java
@@ -242,6 +242,14 @@ public class UriTemplateUnitTest {
 		assertThat(template.expand(2).toString(), is("/foo/2"));
 	}
 
+	/**
+	 * @see #273
+	 */
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsEmptyBaseUri() {
+		new UriTemplate(null, TemplateVariables.NONE);
+	}
+
 	private static void assertVariables(UriTemplate template, TemplateVariable... variables) {
 		assertVariables(template, Arrays.asList(variables));
 	}