diff --git a/format-master.xml b/format-master.xml
index 1b1ad80..5d36b73 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1754,16 +1754,34 @@
 		@url: A URL that the hyperlink links to. If no link text is
 		provided, the URL is used as the link text. [optional]
 	-->
-	<template name="hyperlink-label" match="hyperlink[@label]">
+	<template name="hyperlink-label" match="hyperlink[@label and node()]">
 		<latex>\hyperref[<xsl:value-of select="@label" />]{<xsl:apply-templates />}</latex>
 		<html><A HREF="#{@label}"><xsl:apply-templates /></A></html>
 	</template>
 
+	<template name="empty-hyperlink-label" match="hyperlink[@label and not(node())]">
+		<common>
+			<xsl:message terminate="yes">&lt;hyperlink&gt; with @label must include link text.</xsl:message>
+		</common>
+	</template>
+
 	<template name="hyperlink-url" match="hyperlink[@url and node()]">
 		<latex>\href{<xsl:value-of select="@url" />}{<xsl:apply-templates />}</latex>
 		<html><A HREF="{@url}"><xsl:apply-templates /></A></html>
 	</template>
 
+	<template name="empty-hyperlink-url" match="hyperlink[@url and not(node())]">
+		<!-- Note: not safe to use the url package here because \url{...} is fragile. -->
+		<latex>\url{<xsl:value-of select="@url" />}</latex>
+		<html><A HREF="{@url}"><CODE><xsl:value-of select="@url" /></CODE></A></html>
+	</template>
+
+	<template name="hyperlink-bogus" match="hyperlink[@url and @label]" priority="2">
+		<common>
+			<xsl:message terminate="yes">Cannot use both @url and @label in &lt;hyperlink&gt;.</xsl:message>
+		</common>
+	</template>
+
 	<!-- Internal parameterised hyperlink template to be called by the likes of the empty Oracle documentation elements. -->
 	<template name="hyperlink-internal" match="hyperlink" mode="hyperlink-internal">
 		<common>
@@ -1774,15 +1792,9 @@
 		<html><A HREF="{$url}"><xsl:apply-templates select="exsl:node-set($label)" /></A></html>
 	</template>
 
-	<template name="empty-hyperlink-url" match="hyperlink[@url and not(node())]">
-		<!-- Note: not safe to use the url package here because \url{...} is fragile. -->
-		<latex>\href{<xsl:value-of select="@url" />}{\texttt{<xsl:value-of select="@url" />}}</latex>
-		<html><A HREF="{@url}"><CODE><xsl:value-of select="@url" /></CODE></A></html>
-	</template>
-
 	<template name="empty-hyperlink-url-internal" match="hyperlink" mode="empty-hyperlink-internal">
 		<common><xsl:param xmlns:xsl-out="http://www.w3.org/1999/XSL/Transform" name="url" /></common>
-		<latex>\href{<xsl:value-of select="$url" />}{\texttt{<xsl:value-of select="$url" />}}</latex>
+		<latex>\url{<xsl:value-of select="$url" />}</latex>
 		<html><A HREF="{$url}"><CODE><xsl:value-of select="$url" /></CODE></A></html>
 	</template>
 
@@ -1795,7 +1807,7 @@
 			with by the <hyperlink> templates), so we'll just use
 			\texttt{...}.
 		-->
-		<latex>\texttt{<xsl:apply-templates />}</latex>
+		<latex>\nolinkurl{<xsl:apply-templates />}</latex>
 		<html><CODE><xsl:apply-templates /></CODE></html>
 	</template>
 	
