diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
index 237d5555..a3ccc717 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
@@ -59,6 +59,10 @@ public class CoreDispatcher {
         Calendar cal = Calendar.getInstance();
         String bearer = null;
         AuthSecretToken authSecretTokenOut = getAuthSecretTokenOut(operatorId3irdpty, operatorID);
+        if (authSecretTokenOut!=null) {
+            String error = String.format("secret/token not found for [%s/%s](opId3pt/opId)", operatorId3irdpty, operatorID);
+            throw new RuntimeException(error);
+        }
         try {
             if (object.getClass().getSimpleName().equals("CommonRequest")) {
                 CommonRequest commonRequest = (CommonRequest) object;