diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java
index 33c43394..58585117 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java
@@ -306,7 +306,8 @@ public void invoke(String... args) throws Exception {
                         } else {
                             password = new AuthPlainPassword(plainPassword);
                         }
-                        instance.registration(username, email, password, map);
+                        User user = instance.registration(username, email, password, map);
+                        logger.info("User '{}' registered", user.toString());
                     }
                 });
             }
diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java
index acedeca8..646fe1ce 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java
@@ -36,6 +36,10 @@ public void invoke(String... args) throws Exception {
                 if(profile == null) {
                     logger.warn("Profile {} not found", args[0]);
                 }
+                if(pair == null) {
+                    logger.error("AuthId {} not found", args[1]);
+                    return;
+                }
                 String token = server.authManager.newCheckServerToken(args[0], pair.name);
                 logger.info("Server token {} authId {}: {}", args[0], pair.name, token);
             }