diff --git a/java/google/registry/util/DomainNameUtils.java b/java/google/registry/util/DomainNameUtils.java
index 4cfa942b1..b8fcad2a5 100644
--- a/java/google/registry/util/DomainNameUtils.java
+++ b/java/google/registry/util/DomainNameUtils.java
@@ -60,7 +60,7 @@ public final class DomainNameUtils {
   public static String getTldFromDomainName(String fullyQualifiedDomainName) {
     checkArgument(
         !Strings.isNullOrEmpty(fullyQualifiedDomainName),
-        "secondLevelDomainName cannot be null or empty");
+        "fullyQualifiedDomainName cannot be null or empty");
     return getTldFromDomainName(InternetDomainName.from(fullyQualifiedDomainName));
   }
 
@@ -74,7 +74,7 @@ public final class DomainNameUtils {
    */
   public static String getTldFromDomainName(InternetDomainName domainName) {
     checkArgumentNotNull(domainName);
-    checkArgument(domainName.hasParent(), "secondLevelDomainName does not have a TLD");
+    checkArgument(domainName.hasParent(), "domainName does not have a TLD");
     return domainName.parent().toString();
   }
 
diff --git a/javatests/google/registry/util/DomainNameUtilsTest.java b/javatests/google/registry/util/DomainNameUtilsTest.java
index 9daa2c561..fc0bd4b97 100644
--- a/javatests/google/registry/util/DomainNameUtilsTest.java
+++ b/javatests/google/registry/util/DomainNameUtilsTest.java
@@ -45,7 +45,7 @@ public class DomainNameUtilsTest {
   }
 
   @Test
-  public void testCanonicalizeDomainName_acePrefixUnicodeChars() {
+  public void testCanonicalizeDomainName_acePrefixUnicodeChars() throws Exception {
     thrown.expect(IllegalArgumentException.class);
     canonicalizeDomainName("xn--みんな");
   }