diff --git a/server/src/networking.py b/server/src/networking.py
index 27f4fbe..e2fb9cb 100644
--- a/server/src/networking.py
+++ b/server/src/networking.py
@@ -48,6 +48,10 @@ def db_handle_friend_request(self, sender: str, receiver: str):
                 request_list = db.search_entry(
                     table_name, receiver, "pending_friends"
                 )
+
+                if request_list is None:
+                    request_list = []
+
                 if sender not in request_list:
                     # print(f"Sender: {sender} Receiver: {receiver}")
                     db.append_entry(
diff --git a/server/src/signup.py b/server/src/signup.py
index e4fa994..e002351 100644
--- a/server/src/signup.py
+++ b/server/src/signup.py
@@ -59,7 +59,7 @@ def signup_user(self, username: str, password: str):
 
         self.logger.info(f"User {username} available")
 
-        signup_data = {"username": username, "password": password}
+        signup_data = {"username": username, "password": password, "friends_list": {}, "pending_friends": {}, "sus_score": 0, "ip": None, "sent_friends": {}}  # noqa: E501
 
         db.add_entry(table_name, signup_data)
 
diff --git a/server/src/sustainability.py b/server/src/sustainability.py
index 5d5e200..287a6f0 100644
--- a/server/src/sustainability.py
+++ b/server/src/sustainability.py
@@ -329,7 +329,6 @@ def calc_scores_from_route(self, journey_data):
             )
         return transport_score
 
-
     def update_user_sus_score(self, user: str) -> float:
         db = DataBase()
         db.connect_db()