diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index b4c59701..4a7f2c7a 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -139,7 +139,7 @@ class DiplomaticMessage extends Message{
 
     protected function acceptMerge(){
         $helper = new Engine\Diplomacy($this->src->nationID, $this->dest->nationID);
-        $chk = $helper->acceptMerge();
+        $chk = $helper->acceptMerge($this->src->generalID, $this->dest->generalID);
         if($chk[0] !== self::ACCEPTED){
             return $chk;
         }
@@ -175,7 +175,7 @@ class DiplomaticMessage extends Message{
 
     protected function acceptSurrender(){
         $helper = new Engine\Diplomacy($this->src->nationID, $this->dest->nationID);
-        $chk = $helper->acceptSurrender();
+        $chk = $helper->acceptSurrender($this->src->generalID, $this->dest->generalID);
         if($chk[0] !== self::ACCEPTED){
             return $chk;
         }
@@ -228,7 +228,7 @@ class DiplomaticMessage extends Message{
             $this->dest->nationID
         );
 
-        if(!$general){
+        if($general){
             $this->dest->generalID = $receiverID;
             $this->dest->generalName = $general['name'];
         }
diff --git a/hwe/sammo/Engine/Diplomacy.php b/hwe/sammo/Engine/Diplomacy.php
index 1ee28199..6ebb40d4 100644
--- a/hwe/sammo/Engine/Diplomacy.php
+++ b/hwe/sammo/Engine/Diplomacy.php
@@ -187,8 +187,8 @@ class Diplomacy{
 
         $db = \sammo\DB::db();
 
-        $states = $db->queryOneField(
-            'SELECT `state` FROM diplomacy WHERE me = %i AND you != %i AND `state` NOT IN (2, 7) GROUP BY `state` ORDER BY `state`',
+        $states = $db->queryFirstColumn(
+            'SELECT `state` FROM diplomacy WHERE `state` NOT IN (2, 7) AND me=%i AND you <>%i',
             $this->srcNation['nation'],
             $this->destNation['nation']
         );