diff --git a/settings.gradle b/settings.gradle
index a26d37e..91188d9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'citrus'
+rootProject.name = 'citrusServer'
diff --git a/src/main/java/org/ntlab/citrusserver/CitrusServerApplication.java b/src/main/java/org/ntlab/citrusserver/CitrusServerApplication.java
index 6bbde6b..33b4d32 100644
--- a/src/main/java/org/ntlab/citrusserver/CitrusServerApplication.java
+++ b/src/main/java/org/ntlab/citrusserver/CitrusServerApplication.java
@@ -2,12 +2,20 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class CitrusServerApplication {
+public class CitrusServerApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(CitrusServerApplication.class, args);
     }
 
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder  application) {
+        return application.sources(CitrusServerApplication.class);
+
+    }
+
 }
diff --git a/src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java b/src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java
index 95f3f4b..db1a1df 100644
--- a/src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java
+++ b/src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java
@@ -204,6 +204,9 @@
         if(bookManager.getBooks(accountId) == null){
             return null;
         }
+        if(bookManager.getBook(accountId, bookId) == null){
+            return null;
+        }
         if(!todos.containsKey(accountId)){
             todos.put(accountId, new HashMap<>());
         }
diff --git a/src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java b/src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java
index 6a00427..6eae3f8 100644
--- a/src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java
+++ b/src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java
@@ -77,11 +77,11 @@
                                @QueryParam("token") String token,
                                @QueryParam("password")String password) {
         if(accountManager.checkToken(accountId, token)) {
-            accountManager.deleteAccount(accountId, token, password);
             bookManager.deleteAllBooks(accountId);
             todoManager.deleteAllTodosByAccountId(accountId);
             scheduleManager.deleteSchedules(accountId);
             favoriteManager.removeFavoriteById(accountId);
+            accountManager.deleteAccount(accountId, token, password);
             return;
         }
         //404