diff --git a/check-my-stuff b/check-my-stuff
index eb4a5e9db..2c8eda7ff 100755
--- a/check-my-stuff
+++ b/check-my-stuff
@@ -6,16 +6,14 @@ if [ "$#" -eq "0" ]
     exit
 fi
 
-if [ "$1" = "--all" ]
-then
-   MNT=""
-else
-   MNT="-m $1"
-fi
-
 BASE="$(realpath "$0")"
 BASE="$(dirname "$BASE")"
 cd "$BASE" || exit 1
 
-utils/schema-check/dn42-schema.py -v scan data/ $MNT || ( echo "Schema validation failed, please check above!" ; exit 1 )
+if [ "$1" = "--all" ]; then
+    utils/schema-check/dn42-schema.py -v scan data/ || ( echo "Schema validation failed, please check above!" ; exit 1 )
+else
+    utils/schema-check/dn42-schema.py -v scan data/ -f "data/mntner/$1" || ( echo "Schema validation for mntner object failed, please check above!" ; exit 1 )
+    utils/schema-check/dn42-schema.py -v scan data/ -m "$1" || ( echo "Schema validation for related objects failed, please check above!" ; exit 1 )
+fi