diff --git a/src/commands.c b/src/commands.c
index 56b2d3a..c901f77 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -128,7 +128,7 @@ void cmd_add(WINDOW *window, ToxWindow *prompt, Tox *m, int argc, char (*argv)[M
             break;
 
         case TOX_FAERR_ALREADYSENT:
-            wprintw(window, "Friend request already sent.\n");
+            wprintw(window, "Friend request has already been sent.\n");
             break;
 
         case TOX_FAERR_UNKNOWN:
@@ -144,7 +144,7 @@ void cmd_add(WINDOW *window, ToxWindow *prompt, Tox *m, int argc, char (*argv)[M
             break;
 
         default:
-            wprintw(window, "Friend added as %d.\n", num);
+            wprintw(window, "Friend request sent.\n");
             on_friendadded(m, num);
             break;
     }
diff --git a/src/friendlist.c b/src/friendlist.c
index e65c636..9670c53 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -133,12 +133,6 @@ static void select_friend(Tox *m, wint_t key)
             }
         }
     } else return;    /* Bad key input */
-
-    /* If we reach this something is wrong */
-    endwin();
-    tox_kill(m);
-    fprintf(stderr, "select_friend() failed. Aborting...\n");
-    exit(EXIT_FAILURE);
 }
 
 static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key)
@@ -260,7 +254,7 @@ static void friendlist_onInit(ToxWindow *self, Tox *m)
 
 }
 
-ToxWindow new_friendlist()
+ToxWindow new_friendlist(void)
 {
     ToxWindow ret;
     memset(&ret, 0, sizeof(ret));