diff --git a/src/chat.c b/src/chat.c
index b6cb639..dbc53c5 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -270,6 +270,7 @@ void execute(ToxWindow *self, ChatContext *ctx, Tox *m, char *cmd)
 
     else if (!strcmp(cmd, "/quit") || !strcmp(cmd, "/exit") || !strcmp(cmd, "/q")) {
         endwin();
+        tox_kill(m);
         exit(0);
     }
 
diff --git a/src/prompt.c b/src/prompt.c
index 0444494..19ab274 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -235,6 +235,7 @@ void cmd_connect(ToxWindow *self, Tox *m, int argc, char **argv)
 void cmd_quit(ToxWindow *self, Tox *m, int argc, char **argv)
 {
     endwin();
+    tox_kill(m);
     exit(0);
 }
 
diff --git a/src/windows.c b/src/windows.c
index 1e28667..229e224 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -64,8 +64,11 @@ void on_nickchange(Tox *m, int friendnumber, uint8_t *string, uint16_t length, v
     int i;
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
-        if (windows[i].onNickChange != NULL)
+        if (windows[i].onNickChange != NULL) {
             windows[i].onNickChange(&windows[i], friendnumber, string, length);
+            if (store_data(m, DATA_FILE))
+                wprintw(prompt->window, "\nCould not store Tox data\n");
+        }
     }
 }