diff --git a/src/main/java/ru/soune/nocopy/handler/UserInfoHandler.java b/src/main/java/ru/soune/nocopy/handler/UserInfoHandler.java
index e106344..841d5df 100644
--- a/src/main/java/ru/soune/nocopy/handler/UserInfoHandler.java
+++ b/src/main/java/ru/soune/nocopy/handler/UserInfoHandler.java
@@ -155,13 +155,13 @@ public class UserInfoHandler implements RequestHandler {
             map.put("id", user.getId());
             map.put("fullName", user.getFullName());
             map.put("email", user.getEmail());
-            map.put("verificationStatus", user.getVerificationStatus().name());
+            map.put("verificationStatus", user.getVerificationStatus() != null ? user.getVerificationStatus().name() : null);
             map.put("createdAt", user.getCreatedAt() != null ? user.getCreatedAt().toString() : null);
 
             TariffInfo tariff = user.getActiveTariffInfo();
             if (tariff != null) {
-                map.put("tariff", tariff.getStatus().name());
-                map.put("tokens", tariff.getTokens());
+                map.put("tariff", tariff.getStatus() != null ? tariff.getStatus().name() : null);
+                map.put("tokens", tariff.getTokens() != null ? tariff.getTokens() : 0);
             } else {
                 map.put("tariff", null);
                 map.put("tokens", 0);