diff --git a/debian/changelog b/debian/changelog
index f35210a..a037636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20220425) UNRELEASED; urgency=medium
+
+  * Run root check before attempting nonint functions
+
+ -- Serge Schneider <serge@raspberrypi.com>  Mon, 25 Apr 2022 15:00:17 +0100
+
 raspi-config (20220419) bullseye; urgency=medium
 
   * Reinstate -R parameter for xcompmgr
diff --git a/raspi-config b/raspi-config
index b2109f3..ea645f4 100755
--- a/raspi-config
+++ b/raspi-config
@@ -2809,6 +2809,12 @@ nonint() {
   "$@"
 }
 
+# Everything needs to be run as root
+if [ $(id -u) -ne 0 ]; then
+  printf "Script must be run as root. Try 'sudo raspi-config'\n"
+  exit 1
+fi
+
 #
 # Command line options for non-interactive use
 #
@@ -2854,12 +2860,6 @@ done
 #  exit 0
 #fi
 
-# Everything else needs to be run as root
-if [ $(id -u) -ne 0 ]; then
-  printf "Script must be run as root. Try 'sudo raspi-config'\n"
-  exit 1
-fi
-
 if [ -n "${OPT_MEMORY_SPLIT:-}" ]; then
   set -e # Fail when a command errors
   set_memory_split "${OPT_MEMORY_SPLIT}"