diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index bef207cf..e881026b 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -82,7 +82,7 @@ namespace ReallifeGamemode.Server.Events
                 Caller = null,
                 Description = "Gestorben",
                 Time = DateTime.Now,
-                Type = 0,
+                Type = MedicTaskType.REVIVE,
                 MedicName = "none"
             };
             Medic.AddTaskToList(reviveTask);
diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index 5146954a..ba7e453b 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -22,15 +22,20 @@ namespace ReallifeGamemode.Server.Factions.Medic
 
         public static void AddTaskToList(MedicTask task)
         {
+            if (task == null)
+            {
+                return;
+            }
+
             switch (task.Type)
             {
-                case 0:
+                case MedicTaskType.REVIVE:
                     ReviveTasks.Add(task);
                     break;
-                case 1:
+                case MedicTaskType.HEAL:
                     HealTasks.Add(task);
                     break;
-                case 2:
+                case MedicTaskType.FIRE:
                     FireTasks.Add(task);
                     break;
             }
@@ -38,15 +43,20 @@ namespace ReallifeGamemode.Server.Factions.Medic
 
         public static void RemoveTaskFromList(MedicTask task)
         {
+            if(task == null)
+            {
+                return;
+            }
+
             switch (task.Type)
             {
-                case 0:
+                case MedicTaskType.REVIVE:
                     ReviveTasks.Remove(task);
                     break;
-                case 1:
+                case MedicTaskType.HEAL:
                     HealTasks.Remove(task);
                     break;
-                case 2:
+                case MedicTaskType.FIRE:
                     FireTasks.Remove(task);
                     break;
             }
diff --git a/ReallifeGamemode.Server/Factions/Medic/MedicTask.cs b/ReallifeGamemode.Server/Factions/Medic/MedicTask.cs
index 0d06c2d6..8be1577c 100644
--- a/ReallifeGamemode.Server/Factions/Medic/MedicTask.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/MedicTask.cs
@@ -16,11 +16,18 @@ namespace ReallifeGamemode.Server.Factions.Medic
     {
         public string Victim { get; set; }
         public Vector3 Position { get; set; }
-        public int Type { get; set; }
+        public MedicTaskType Type { get; set; }
         public string CauseOfDeath { get; set; }
         public string Description { get; set; }
         public string Caller { get; set; }
         public DateTime Time { get; set; }
         public string MedicName { get; set; }
     }
+
+    public enum MedicTaskType
+    {
+        REVIVE,
+        HEAL,
+        FIRE
+    }
 }