diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index af5e43770..1e3d39b3e 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " build release trace delete ls logs run url urls version help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
diff --git a/plugins/20_events/commands b/plugins/20_events/commands
index d3d0a16f4..582b5c38f 100755
--- a/plugins/20_events/commands
+++ b/plugins/20_events/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " events events:on events:off events:list help events:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
diff --git a/plugins/apps/commands b/plugins/apps/commands
index 93052e0d0..a73e97975 100755
--- a/plugins/apps/commands
+++ b/plugins/apps/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " apps apps:create apps:destroy help apps:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
diff --git a/plugins/backup/commands b/plugins/backup/commands
index 9cd99a5ca..90f28a4ad 100755
--- a/plugins/backup/commands
+++ b/plugins/backup/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " backup:export backup:import help backup:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
diff --git a/plugins/certs/commands b/plugins/certs/commands
index ba6e62bc0..1ecacd41c 100755
--- a/plugins/certs/commands
+++ b/plugins/certs/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " certs:add certs:generate certs:info certs:remove certs:update help certs:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/certs/functions"
diff --git a/plugins/config/commands b/plugins/config/commands
index 191af9f52..f5b929449 100755
--- a/plugins/config/commands
+++ b/plugins/config/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " config config:get config:set config:unset help config:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
diff --git a/plugins/docker-options/commands b/plugins/docker-options/commands
index 4148605d6..a1396c1cc 100755
--- a/plugins/docker-options/commands
+++ b/plugins/docker-options/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " docker-options docker-options:add docker-options:remove help docker-options:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
diff --git a/plugins/domains/commands b/plugins/domains/commands
index f134e151c..36f4ffa2c 100755
--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " domains domains:setup domains:add domains:clear domains:remove help domains:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
diff --git a/plugins/enter/commands b/plugins/enter/commands
index b8e0bdbdc..b69217e98 100755
--- a/plugins/enter/commands
+++ b/plugins/enter/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " enter help enter:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands
index 3851cdceb..c3508c967 100755
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " nginx:build-config nginx:access-logs nginx:error-logs help nginx:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/certs/functions"
diff --git a/plugins/plugin/commands b/plugins/plugin/commands
index 8df025c37..d4eb65327 100755
--- a/plugins/plugin/commands
+++ b/plugins/plugin/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " plugin plugin:install plugin:install-dependencies plugin:update plugin:disable plugin:enable plugin:uninstall help plugin:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
diff --git a/plugins/ps/commands b/plugins/ps/commands
index d9614c623..3e0a7357a 100755
--- a/plugins/ps/commands
+++ b/plugins/ps/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " ps ps:start ps:stop ps:rebuild ps:rebuildall ps:restart ps:restartall ps:scale help ps:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"
diff --git a/plugins/shell/commands b/plugins/shell/commands
index f64e231aa..16fec26f4 100755
--- a/plugins/shell/commands
+++ b/plugins/shell/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " shell help shell:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
diff --git a/plugins/tags/commands b/plugins/tags/commands
index 58061e835..9990485a9 100755
--- a/plugins/tags/commands
+++ b/plugins/tags/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " tags tags:create tags:deploy tags:destroy help tags:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/tags/functions"
diff --git a/plugins/tar/commands b/plugins/tar/commands
index 76da3766f..e57faeabd 100755
--- a/plugins/tar/commands
+++ b/plugins/tar/commands
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+[[ " tar-from tar:from tar-in tar:in tar-build tar-build-locked help tar:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"