diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java
index f1f9cd4cf..fdc8edf8b 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java
@@ -29,7 +29,7 @@ public class UserRoleSessionMapStore extends TemplateMapStore<UserRoleSession> {
     @Override
     public String[] getFields() {
         return new String[]{
-                "ID",  "USER_ID",  "USER_ROLE",  "COMPANY_ID",  "STATUS"
+                "ID", "USER_ID", "USER_ROLE", "COMPANY_ID", "STATUS"
         };
     }
 
@@ -40,7 +40,7 @@ public class UserRoleSessionMapStore extends TemplateMapStore<UserRoleSession> {
         object.setId(resultSet.getObject("ID", Long.class));
         object.setUserId(resultSet.getObject("USER_ID", Long.class));
         object.setUserRole(resultSet.getObject("USER_ROLE", String.class));
-        object.setCompanyId(companyId.equals(0L) ? 1 : companyId);
+        object.setCompanyId(companyId == null || companyId.equals(0L) ? 1 : companyId);
         object.setStatus(resultSet.getObject("STATUS", String.class));
         return object;
     }