diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c
index d1c35d9b626..979c9b5ce15 100644
--- a/binfmt/binfmt_execmodule.c
+++ b/binfmt/binfmt_execmodule.c
@@ -369,7 +369,6 @@ errout_with_tcbinit:
 #endif
 
   nxtask_uninit(tcb);
-  return ret;
 
 errout_with_addrenv:
 #if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)
diff --git a/sched/environ/environ.h b/sched/environ/environ.h
index 5035c812c9c..939b0f32d36 100644
--- a/sched/environ/environ.h
+++ b/sched/environ/environ.h
@@ -36,7 +36,7 @@
 
 #ifdef CONFIG_DISABLE_ENVIRON
 #  define env_dup(group, envp) (0)
-#  define env_release(group)   (0)
+#  define env_release(group)   ((void)0)
 #else
 
 #  define SCHED_ENVIRON_RESERVED (4)