diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index 710c0e7e..7ed261ec 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -3,6 +3,7 @@ using GTANetworkAPI;
 using Newtonsoft.Json;
 using ReallifeGamemode.Server.Services;
 using System.Linq;
+using ReallifeGamemode.Services;
 
 /**
  * @overview Life of German Reallife - Server Factions Medic Medic.cs
@@ -86,16 +87,21 @@ namespace ReallifeGamemode.Server.Factions.Medic
     [RemoteEvent("updateMedicTask")]
     public void UpdateMedicTasks(Player player, int type, int index, string medicName)
     {
+      Player target = PlayerService.GetPlayerByNameOrId(medicName);
       switch (type)
       {
         case 0:
+          
           ReviveTasks[index].MedicName = medicName;
           ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Reviveauftrag von " + medicName + " angenommen.", new List<int>() { 2 });
+          target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat dein Auftrag angenommen.");
+
           break;
 
         case 1:
           HealTasks[index].MedicName = medicName;
           ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + medicName + " angenommen.", new List<int>() { 2 });
+          target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat dein Auftrag angenommen.");
           break;
 
         case 2:
diff --git a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs
index 989656a7..08df6040 100644
--- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs
+++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs
@@ -9,6 +9,7 @@ using ReallifeGamemode.Server.Extensions;
 using ReallifeGamemode.Server.Services;
 using ReallifeGamemode.Server.Types;
 using ReallifeGamemode.Server.Util;
+using ReallifeGamemode.Services;
 
 namespace ReallifeGamemode.Server.Job
 {
@@ -89,10 +90,21 @@ namespace ReallifeGamemode.Server.Job
           User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault();
             player.SendNotification("~r~[Info] ~w~ Dein Kunde hat kein Geld mehr auf der Hand.");
           
+          if(target.Handmoney <= 0)
+          {
+            Player targetmoney = PlayerService.GetPlayerByNameOrId(Convert.ToString(targetId));
+            targetmoney.SendNotification("~r~[Fehler] ~w~ Du hast kein Geld mehr auf der Hand.");
+            player.SendNotification("~r~[Fehler] ~w~ Dein Fahrgast kann dich nicht mehr bezahlen.");
+            player.TriggerEvent("CLIENT:cancelFare");
+            targetmoney.TriggerEvent("CLIENT:cancelFareCustomer");
+            targetmoney.WarpOutOfVehicle();
+          }
+          else 
+          { 
             target.Handmoney -= amount;
             player.GetUser(dbContext).Wage += amount;
             dbContext.SaveChanges();
-          
+          }
           //target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney);
         }
       }