diff --git a/Server/src/main/content/minigame/barbassault/lobby/AcceptRoleInterface.kt b/Server/src/main/content/minigame/barbassault/lobby/AcceptRoleInterface.kt
index 2a3f45c14..a11f0e96f 100644
--- a/Server/src/main/content/minigame/barbassault/lobby/AcceptRoleInterface.kt
+++ b/Server/src/main/content/minigame/barbassault/lobby/AcceptRoleInterface.kt
@@ -64,13 +64,14 @@ class AcceptRoleInterface  : ComponentPlugin() {
     private fun handleAccept(player: Player?) {
         val team = player?.baSession?.team
         val recruit = team?.recruit
+        if (!recruit?.accept!!) {
+            sendMessage(player,"The other player hasn't confirmed their role yet.")
+            return
+        }
+
         val selectedRole = recruit?.role ?: return
         val roleName = selectedRole.name.lowercase().replaceFirstChar { it.uppercase() }
         val rPlayer = recruit.player
-        if (!recruit.accept) {
-            sendMessage(player,"the other player hasn't confirmed their role yet.")
-            return
-        }
         if (joinTeam(rPlayer, selectedRole)) {
             rPlayer.sendMessage("You have joined as ${roleName}.")
             team.recruit = null
diff --git a/Server/src/main/content/minigame/barbassault/lobby/RoleSelectInterface.kt b/Server/src/main/content/minigame/barbassault/lobby/RoleSelectInterface.kt
index b5ea36bfe..034ad8cf5 100644
--- a/Server/src/main/content/minigame/barbassault/lobby/RoleSelectInterface.kt
+++ b/Server/src/main/content/minigame/barbassault/lobby/RoleSelectInterface.kt
@@ -121,12 +121,12 @@ private fun handleAccept(player: Player){
     return
 }
 private fun handleDecline(player: Player) {
-    closeInterface(player)
     val leader = player.baSession?.team?.getLeader()?.player
-    if (leader != null && leader != player) {
-        closeInterface(leader)
-        sendMessage(leader, "The applicant declined your offer.")
-    }
+    sendMessage(leader!!, "The applicant declined your offer.")
+    closeInterface(player)
+
+
+
 }