diff --git a/src/exec.c b/src/exec.c
index 3cdf92fc5..3fb5134ff 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -157,8 +157,6 @@ exec_cmnd(struct command_details *details, struct command_status *cstat,
     restore_signals();
     if (exec_setup(details, NULL, -1) == true) {
 	/* headed for execve() */
-	sudo_debug_execve(SUDO_DEBUG_INFO, details->command,
-	    details->argv, details->envp);
 	if (details->closefrom >= 0) {
 	    int fd, maxfd;
 	    unsigned char *debug_fds;
diff --git a/src/exec_common.c b/src/exec_common.c
index bb4460f76..78ad7adf7 100644
--- a/src/exec_common.c
+++ b/src/exec_common.c
@@ -181,6 +181,10 @@ disable_execute(char *envp[])
 int
 sudo_execve(int fd, const char *path, char *const argv[], char *envp[], bool noexec)
 {
+    debug_decl(sudo_execve, SUDO_DEBUG_UTIL)
+
+    sudo_debug_execve(SUDO_DEBUG_INFO, path, argv, envp);
+
     /* Modify the environment as needed to disable further execve(). */
     if (noexec)
 	envp = disable_execute(envp);
@@ -206,5 +210,5 @@ sudo_execve(int fd, const char *path, char *const argv[], char *envp[], bool noe
 	    free(nargv);
 	}
     }
-    return -1;
+    debug_return_int(-1);
 }