diff --git a/src/main/java/org/sadtech/vkbot/core/VkApi.java b/src/main/java/org/sadtech/vkbot/core/VkApi.java
index 7a0f84d..d868ff0 100644
--- a/src/main/java/org/sadtech/vkbot/core/VkApi.java
+++ b/src/main/java/org/sadtech/vkbot/core/VkApi.java
@@ -59,7 +59,13 @@ public class VkApi {
         } catch (ApiException | ClientException e) {
             e.printStackTrace();
         }
-        return temp != null ? temp.get(0).getCity().getTitle() : null;
+        if (temp!=null) {
+            if (temp.get(0).getCity()!=null) {
+                log.info("Запрошен город пользователя: " + temp.get(0).getCity().getTitle());
+                return temp.get(0).getCity().getTitle();
+            }
+        }
+        return null;
     }
 
 
diff --git a/src/main/java/org/sadtech/vkbot/core/entity/Comment.java b/src/main/java/org/sadtech/vkbot/core/entity/Comment.java
index c536f61..dc1d7e1 100644
--- a/src/main/java/org/sadtech/vkbot/core/entity/Comment.java
+++ b/src/main/java/org/sadtech/vkbot/core/entity/Comment.java
@@ -1,10 +1,22 @@
 package org.sadtech.vkbot.core.entity;
 
+//@TODO: Дописать класс
 public class Comment {
 
     private Integer postId;
-    private Integer fromId;
+    private Person person;
     private String text;
     private Integer data;
 
+    public Comment() {
+
+    }
+
+    public Person getPerson() {
+        return person;
+    }
+
+    public void setPerson(Person person) {
+        this.person = person;
+    }
 }