diff --git a/lib/Lacuna/RPC.pm b/lib/Lacuna/RPC.pm
index de907af7..d3760bcb 100644
--- a/lib/Lacuna/RPC.pm
+++ b/lib/Lacuna/RPC.pm
@@ -48,6 +48,7 @@ sub get_session {
 
     $session->current_empire($session->empire)
         unless $session->current_empire;
+    $session->current_empire->current_session($session);
 
     my $empire = $session->current_empire;
     if (defined $empire) {
diff --git a/lib/Lacuna/RPC/Building/SpacePort.pm b/lib/Lacuna/RPC/Building/SpacePort.pm
index 4fddfe20..6afa95ce 100644
--- a/lib/Lacuna/RPC/Building/SpacePort.pm
+++ b/lib/Lacuna/RPC/Building/SpacePort.pm
@@ -349,7 +349,7 @@ sub send_ship_types {
                                       {order_by => 'speed', rows => $quantity }
                                       );
         my $ship = $ships[0]; #Need to grab slowest ship
-        confess [1009, "Sitters cannot send this type of ship."] if $empire->current_session->is_sitter and not $ship->sitter_can_send;
+        confess [1009, "Sitters cannot send this type of ship."] if $session->is_sitter and not $ship->sitter_can_send;
         # We only need to check one of the ships
         $ship->can_send_to_target($target);