diff --git a/database/wiiu/accept_friend_request_and_return_friend_info.go b/database/wiiu/accept_friend_request_and_return_friend_info.go
index 1fd0407..3a29693 100644
--- a/database/wiiu/accept_friend_request_and_return_friend_info.go
+++ b/database/wiiu/accept_friend_request_and_return_friend_info.go
@@ -64,6 +64,10 @@ func AcceptFriendRequestAndReturnFriendInfo(friendRequestID uint64) (friends_wii
 
 	friendInfo := friends_wiiu_types.NewFriendInfo()
 	connectedUser, ok := globals.ConnectedUsers.Get(senderPID)
+	friendInfo.NNAInfo, err = GetUserNetworkAccountInfo(senderPID)
+	if err != nil {
+		return friends_wiiu_types.NewFriendInfo(), err
+	}
 	lastOnline := types.NewDateTime(0).Now()
 
 	if ok && connectedUser != nil {
diff --git a/nex/friends-wiiu/accept_friend_request.go b/nex/friends-wiiu/accept_friend_request.go
index 649e8f0..73e462f 100644
--- a/nex/friends-wiiu/accept_friend_request.go
+++ b/nex/friends-wiiu/accept_friend_request.go
@@ -44,7 +44,7 @@ func AcceptFriendRequest(err error, packet nex.PacketInterface, callID uint32, i
 			senderFriendInfo.NNAInfo, err = database_wiiu.GetUserNetworkAccountInfo(senderPID)
 			if err != nil {
 				globals.Logger.Critical(err.Error())
-				return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "") // TODO - Add error message
+				return nil, nex.NewError(nex.ResultCodes.FPD.Unknown, "Tried to accept friend request of unregistered yet connected user.")
 			}
 
 			senderFriendInfo.Presence = senderConnectedUser.PresenceV2.Copy().(friends_wiiu_types.NintendoPresenceV2)