diff --git a/bot-context/pom.xml b/bot-context/pom.xml
index 526502d..92c66c8 100644
--- a/bot-context/pom.xml
+++ b/bot-context/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.struchkov.godfather</groupId>
         <artifactId>godfather-bot</artifactId>
-        <version>0.0.2</version>
+        <version>0.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>bot-context</artifactId>
diff --git a/bot-core/pom.xml b/bot-core/pom.xml
index 0057aa4..8837825 100644
--- a/bot-core/pom.xml
+++ b/bot-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.struchkov.godfather</groupId>
         <artifactId>godfather-bot</artifactId>
-        <version>0.0.2</version>
+        <version>0.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>bot-core</artifactId>
diff --git a/bot-core/src/main/java/dev/struchkov/godfather/core/service/action/AnswerSaveAction.java b/bot-core/src/main/java/dev/struchkov/godfather/core/service/action/AnswerSaveAction.java
index ba3c2b3..4f8aaa1 100644
--- a/bot-core/src/main/java/dev/struchkov/godfather/core/service/action/AnswerSaveAction.java
+++ b/bot-core/src/main/java/dev/struchkov/godfather/core/service/action/AnswerSaveAction.java
@@ -28,9 +28,11 @@ public class AnswerSaveAction<D> implements ActionUnit<AnswerSave<D>, Message> {
         }
 
         PreservableData<D, ? super Message> preservableData = answerSave.getPreservableData();
-        D data = preservableData.getData(mail);
-        if (data != null) {
-            preservable.save(personId, answerSave.getKey(), data);
+        if (preservableData != null) {
+            D data = preservableData.getData(mail);
+            if (data != null) {
+                preservable.save(personId, answerSave.getKey(), data);
+            }
         }
 
         preservable.push(personId, answerSave.getPusher());
diff --git a/pom.xml b/pom.xml
index 811543a..2ec7c65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>dev.struchkov.godfather</groupId>
     <artifactId>godfather-bot</artifactId>
-    <version>0.0.2</version>
+    <version>0.0.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -31,8 +31,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <godfather.context.ver>0.0.2</godfather.context.ver>
-        <godfather.core.ver>0.0.2</godfather.core.ver>
+        <godfather.context.ver>0.0.3-SNAPSHOT</godfather.context.ver>
+        <godfather.core.ver>0.0.3-SNAPSHOT</godfather.core.ver>
         <autoresponder.ver>1.9.4-RELEASE</autoresponder.ver>
 
         <gson.ver>2.8.9</gson.ver>