diff --git a/build/check_misc.xsl b/build/check_misc.xsl
index 42f54668..2381c98b 100644
--- a/build/check_misc.xsl
+++ b/build/check_misc.xsl
@@ -18,6 +18,9 @@
 	xmlns:set="http://exslt.org/sets"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+
+	xmlns:mdxURL="xalan://uk.ac.sdss.xalan.md.URLchecker"
+
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
 	<!--
@@ -153,6 +156,19 @@
 	</xsl:template>
 	
 	
+	<!--
+		Check for Locations that aren't valid URLs.
+	-->
+	<xsl:template match="*[@Location and mdxURL:invalidURL(@Location)]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">
+				<xsl:value-of select='local-name()'/>
+				<xsl:text> Location is not a valid URL: </xsl:text>
+				<xsl:value-of select="mdxURL:whyInvalid(@Location)"/>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
 	<!--
 		Check for empty xml:lang elements, automatically generated by OIOSAML.
 		
diff --git a/tools/xalan/lib/sdss-xalan-md-1.0.jar b/tools/xalan/lib/sdss-xalan-md-1.0.jar
deleted file mode 100644
index 7da085d9..00000000
Binary files a/tools/xalan/lib/sdss-xalan-md-1.0.jar and /dev/null differ
diff --git a/tools/xalan/lib/sdss-xalan-md-1.1.jar b/tools/xalan/lib/sdss-xalan-md-1.1.jar
new file mode 100644
index 00000000..05fa381f
Binary files /dev/null and b/tools/xalan/lib/sdss-xalan-md-1.1.jar differ