diff --git a/src/main/java/ru/ulstu/extractor/model/LineChange.java b/src/main/java/ru/ulstu/extractor/model/LineChange.java
index ff237e7..923909b 100644
--- a/src/main/java/ru/ulstu/extractor/model/LineChange.java
+++ b/src/main/java/ru/ulstu/extractor/model/LineChange.java
@@ -10,9 +10,8 @@ import javax.persistence.Entity;
 @Entity
 public class LineChange extends BaseEntity {
 
-    private Boolean added;
-
-    private Boolean removed;
+    private Boolean added = false;
+    private Boolean removed = false;
     private String lineFrom;
     private String lineTo;
 
diff --git a/src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java b/src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java
index e2ecf19..17238d1 100644
--- a/src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java
+++ b/src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java
@@ -251,20 +251,32 @@ public class GitRepositoryService {
                         if (strings[i].startsWith("---")) {
                             i++;
                         } else {
-                            lineChange.setLineFrom(lineChange.getLineFrom() + "\n" + strings[i]);
-                            i++;
+                            if (lineChange.getLineFrom() == null) {
+                                lineChange.setLineFrom(strings[i]);
+                                i++;
+                            } else {
+                                lineChange.setLineFrom(lineChange.getLineFrom() + "\n" + strings[i]);
+                                i++;
+                            }
                         }
                     }
+                    lineChange.setRemoved(true);
                 }
                 if (strings[i].startsWith("+")) {
                     while ((i < stringsLength) && strings[i].startsWith("+")) {
                         if (strings[i].startsWith("+++")) {
                             i++;
                         } else {
-                            lineChange.setLineTo(lineChange.getLineTo() + "\n" + strings[i]);
-                            i++;
+                            if (lineChange.getLineTo() == null) {
+                                lineChange.setLineTo(strings[i]);
+                                i++;
+                            } else {
+                                lineChange.setLineTo(lineChange.getLineTo() + "\n" + strings[i]);
+                                i++;
+                            }
                         }
                     }
+                    lineChange.setAdded(true);
                 }
                 if ((lineChange.getLineTo() != null) || (lineChange.getLineFrom() != null)
                         || ((lineChange.getLineTo() != null) && (lineChange.getLineFrom() != null))) {