diff --git a/java/google/registry/flows/EppException.java b/java/google/registry/flows/EppException.java
index a2ceeb8be..616f83a39 100644
--- a/java/google/registry/flows/EppException.java
+++ b/java/google/registry/flows/EppException.java
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableSet;
 
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.eppinput.EppInput.InnerCommand;
-import google.registry.model.eppinput.ResourceCommand;
+import google.registry.model.eppinput.EppInput.ResourceCommandWrapper;
 import google.registry.model.eppoutput.Result;
 import google.registry.model.eppoutput.Result.Code;
 
@@ -211,11 +211,13 @@ public abstract class EppException extends Exception {
   /** Specified command is not implemented. */
   @EppResultCode(Code.UnimplementedCommand)
   public static class UnimplementedCommandException extends EppException {
-    public UnimplementedCommandException(InnerCommand command, ResourceCommand resourceCommand) {
+    public UnimplementedCommandException(InnerCommand command) {
       super(String.format(
           "No flow found for %s with extension %s",
           command.getClass().getSimpleName(),
-          resourceCommand == null ? null : resourceCommand.getClass().getSimpleName()));
+          command instanceof ResourceCommandWrapper
+              ? ((ResourceCommandWrapper) command).getResourceCommand().getClass().getSimpleName()
+              : null));
     }
   }
 
diff --git a/java/google/registry/flows/picker/FlowPicker.java b/java/google/registry/flows/picker/FlowPicker.java
index 0f23a99bd..5b735fd54 100644
--- a/java/google/registry/flows/picker/FlowPicker.java
+++ b/java/google/registry/flows/picker/FlowPicker.java
@@ -326,10 +326,7 @@ public class FlowPicker {
       }
     }
     // Nothing usable was found, so throw an exception.
-    throw new UnimplementedCommandException(
-        innerCommand,
-        innerCommand instanceof ResourceCommandWrapper
-            ? ((ResourceCommandWrapper) innerCommand).getResourceCommand() : null);
+    throw new UnimplementedCommandException(innerCommand);
   }
 
   /** Command missing. */