2 files changed, 2 insertions, 2 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index 65a73876..cc22a7f5 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -72,7 +72,7 @@ int getfriend_id(uint8_t * client_id)
 //return -1 if failure.
 int getclient_id(int friend_id, uint8_t * client_id)
 {
-    if(friendnumber >= numfriends || friendnumber < 0)
+    if(friend_id >= numfriends || friend_id < 0)
     {
         return -1;
     }
diff --git a/core/Messenger.h b/core/Messenger.h
index 679df989..95d1d28e 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -53,7 +53,7 @@ int getfriend_id(uint8_t * client_id);
 //make sure that client_id is of size CLIENT_ID_SIZE.
 //returns 0 if success
 //return -1 if failure.
-int getclient_id(int friend_id, uint8_t * client_id)
+int getclient_id(int friend_id, uint8_t * client_id);
 
 //remove a friend
 int m_delfriend(int friendnumber);