diff --git a/lib/wanderer_app/character/tracking_utils.ex b/lib/wanderer_app/character/tracking_utils.ex
index 3f927949..cfb21527 100644
--- a/lib/wanderer_app/character/tracking_utils.ex
+++ b/lib/wanderer_app/character/tracking_utils.ex
@@ -68,15 +68,22 @@ defmodule WandererApp.Character.TrackingUtils do
       {:ok, main_character} =
         get_main_character(user_settings, characters_with_access, characters_with_access)
 
-      following_character_eve_id = case user_settings do
-        nil -> nil
-        %{following_character_eve_id: following_character_eve_id} -> following_character_eve_id
-      end
+      following_character_eve_id =
+        case user_settings do
+          nil -> nil
+          %{following_character_eve_id: following_character_eve_id} -> following_character_eve_id
+        end
+
+      main_character_eve_id =
+        case main_character do
+          nil -> nil
+          %{eve_id: eve_id} -> eve_id
+        end
 
       {:ok,
        %{
          characters: characters_data,
-         main: main_character.eve_id,
+         main: main_character_eve_id,
          following: following_character_eve_id
        }}
     else
diff --git a/lib/wanderer_app/map/server/map_server_signatures_impl.ex b/lib/wanderer_app/map/server/map_server_signatures_impl.ex
index 48d95676..bb755886 100644
--- a/lib/wanderer_app/map/server/map_server_signatures_impl.ex
+++ b/lib/wanderer_app/map/server/map_server_signatures_impl.ex
@@ -119,6 +119,12 @@ defmodule WandererApp.Map.Server.SignaturesImpl do
     end
   end
 
+  def update_signatures(
+        state,
+        _signatures_update
+      ),
+      do: state
+
   defp parse_signatures(signatures, character_eve_id, system_id),
     do:
       signatures
diff --git a/lib/wanderer_app/map/server/map_server_systems_impl.ex b/lib/wanderer_app/map/server/map_server_systems_impl.ex
index a78942df..1630ee3f 100644
--- a/lib/wanderer_app/map/server/map_server_systems_impl.ex
+++ b/lib/wanderer_app/map/server/map_server_systems_impl.ex
@@ -266,31 +266,32 @@ defmodule WandererApp.Map.Server.SystemsImpl do
       |> Enum.filter(fn system -> not is_nil(system) && not system.locked end)
       |> Enum.map(&{&1.solar_system_id, &1.id})
 
-    solar_system_ids_to_remove =
-      filtered_ids
-      |> Enum.map(fn {solar_system_id, _} -> solar_system_id end)
-
-    system_ids_to_remove =
-      filtered_ids
-      |> Enum.map(fn {_, system_id} -> system_id end)
-
-    connections_to_remove =
-      solar_system_ids_to_remove
-      |> Enum.map(fn solar_system_id ->
-        WandererApp.Map.find_connections(map_id, solar_system_id)
-      end)
-      |> List.flatten()
-      |> Enum.uniq_by(& &1.id)
-
-    :ok = WandererApp.Map.remove_connections(map_id, connections_to_remove)
-    :ok = WandererApp.Map.remove_systems(map_id, solar_system_ids_to_remove)
-
-    solar_system_ids_to_remove
-    |> Enum.each(fn solar_system_id ->
+    filtered_ids
+    |> Enum.each(fn {solar_system_id, system_id} ->
       map_id
       |> WandererApp.MapSystemRepo.remove_from_map(solar_system_id)
       |> case do
         {:ok, _} ->
+          :ok = WandererApp.Map.remove_system(map_id, solar_system_id)
+          @ddrt.delete([solar_system_id], rtree_name)
+          Impl.broadcast!(map_id, :systems_removed, [solar_system_id])
+          track_systems_removed(map_id, user_id, character_id, [solar_system_id])
+          remove_system_connections(map_id, [solar_system_id])
+
+          try do
+            cleanup_linked_signatures(map_id, [solar_system_id])
+          rescue
+            e ->
+              Logger.error("Failed to cleanup linked signature: #{inspect(e)}")
+          end
+
+          try do
+            cleanup_linked_system_sig_eve_ids(state, [system_id])
+          rescue
+            e ->
+              Logger.error("Failed to cleanup system linked sig eve ids: #{inspect(e)}")
+          end
+
           :ok
 
         {:error, error} ->
@@ -299,25 +300,68 @@ defmodule WandererApp.Map.Server.SystemsImpl do
       end
     end)
 
+    state
+  end
+
+  defp track_systems_removed(map_id, user_id, character_id, removed_solar_system_ids)
+       when not is_nil(user_id) and not is_nil(character_id) do
+    WandererApp.User.ActivityTracker.track_map_event(:systems_removed, %{
+      character_id: character_id,
+      user_id: user_id,
+      map_id: map_id,
+      solar_system_ids: removed_solar_system_ids
+    })
+    |> case do
+      {:ok, _} -> :ok
+      error -> Logger.error("Failed to track systems removed: #{inspect(error)}")
+    end
+  end
+
+  defp track_systems_removed(_map_id, _user_id, _character_id, _removed_solar_system_ids), do: :ok
+
+  defp remove_system_connections(map_id, solar_system_ids_to_remove) do
+    connections_to_remove =
+      solar_system_ids_to_remove
+      |> Enum.map(fn solar_system_id ->
+        WandererApp.Map.find_connections(map_id, solar_system_id)
+      end)
+      |> List.flatten()
+      |> Enum.uniq_by(& &1.id)
+
     connections_to_remove
     |> Enum.each(fn connection ->
-      Logger.debug(fn -> "Removing connection from map: #{inspect(connection)}" end)
-      WandererApp.MapConnectionRepo.destroy(map_id, connection)
+      try do
+        Logger.debug(fn -> "Removing connection from map: #{inspect(connection)}" end)
+        :ok = WandererApp.MapConnectionRepo.destroy(map_id, connection)
+        :ok = WandererApp.Map.remove_connection(map_id, connection)
+        Impl.broadcast!(map_id, :remove_connections, [connection])
+      rescue
+        e ->
+          Logger.error("Failed to remove connection: #{inspect(e)}")
+      end
     end)
+  end
 
-    solar_system_ids_to_remove
+  defp cleanup_linked_signatures(map_id, removed_solar_system_ids) do
+    removed_solar_system_ids
     |> Enum.map(fn solar_system_id ->
       WandererApp.Api.MapSystemSignature.by_linked_system_id!(solar_system_id)
     end)
     |> List.flatten()
     |> Enum.uniq_by(& &1.system_id)
     |> Enum.each(fn s ->
-      {:ok, %{system: system}} = s |> Ash.load([:system])
-      Ash.destroy!(s)
-
-      Impl.broadcast!(map_id, :signatures_updated, system.solar_system_id)
+      try do
+        {:ok, %{system: system}} = s |> Ash.load([:system])
+        :ok = Ash.destroy!(s)
+        Impl.broadcast!(map_id, :signatures_updated, system.solar_system_id)
+      rescue
+        e ->
+          Logger.error("Failed to cleanup linked signature: #{inspect(e)}")
+      end
     end)
+  end
 
+  defp cleanup_linked_system_sig_eve_ids(state, system_ids_to_remove) do
     linked_system_ids =
       system_ids_to_remove
       |> Enum.map(fn system_id ->
@@ -335,34 +379,6 @@ defmodule WandererApp.Map.Server.SystemsImpl do
         linked_sig_eve_id: nil
       })
     end)
-
-    @ddrt.delete(solar_system_ids_to_remove, rtree_name)
-
-    Impl.broadcast!(map_id, :remove_connections, connections_to_remove)
-    Impl.broadcast!(map_id, :systems_removed, solar_system_ids_to_remove)
-
-    case not is_nil(user_id) do
-      true ->
-        {:ok, _} =
-          WandererApp.User.ActivityTracker.track_map_event(:systems_removed, %{
-            character_id: character_id,
-            user_id: user_id,
-            map_id: map_id,
-            solar_system_ids: solar_system_ids_to_remove
-          })
-
-        :telemetry.execute(
-          [:wanderer_app, :map, :systems, :remove],
-          %{count: solar_system_ids_to_remove |> Enum.count()}
-        )
-
-        :ok
-
-      _ ->
-        :ok
-    end
-
-    state
   end
 
   def maybe_add_system(map_id, location, old_location, rtree_name, map_opts)
diff --git a/lib/wanderer_app_web/live/map/event_handlers/map_core_event_handler.ex b/lib/wanderer_app_web/live/map/event_handlers/map_core_event_handler.ex
index f071b240..d3d68aa3 100644
--- a/lib/wanderer_app_web/live/map/event_handlers/map_core_event_handler.ex
+++ b/lib/wanderer_app_web/live/map/event_handlers/map_core_event_handler.ex
@@ -229,11 +229,6 @@ defmodule WandererAppWeb.MapCoreEventHandler do
 
   def handle_ui_event("noop", _, socket), do: {:noreply, socket}
 
-  def handle_ui_event(event, body, socket) do
-    Logger.debug(fn -> "unhandled map ui event: #{inspect(event)} #{inspect(body)}" end)
-    {:noreply, socket}
-  end
-
   def handle_ui_event(
         _event,
         _body,
@@ -250,6 +245,23 @@ defmodule WandererAppWeb.MapCoreEventHandler do
      )}
   end
 
+  def handle_ui_event(
+        event,
+        body,
+        %{assigns: %{main_character_id: main_character_id}} =
+          socket
+      )
+      when is_nil(main_character_id) do
+    Process.send_after(self(), :no_main_character_set, 100)
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(event, body, socket) do
+    Logger.debug(fn -> "unhandled map ui event: #{inspect(event)} #{inspect(body)}" end)
+    {:noreply, socket}
+  end
+
   defp maybe_start_map(map_id) do
     {:ok, map_server_started} = WandererApp.Cache.lookup("map_#{map_id}:started", false)
 
diff --git a/lib/wanderer_app_web/live/map/map_live.ex b/lib/wanderer_app_web/live/map/map_live.ex
index 57750934..99d6bd96 100644
--- a/lib/wanderer_app_web/live/map/map_live.ex
+++ b/lib/wanderer_app_web/live/map/map_live.ex
@@ -65,7 +65,7 @@ defmodule WandererAppWeb.MapLive do
       {:noreply,
        socket
        |> put_flash(
-         :info,
+         :warning,
          "You don't have main character set, please update it in tracking settings (top right icon)."
        )}