diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
index b6be3487a..f1acbb2fe 100644
--- a/Resources/AnimationLockTime.json
+++ b/Resources/AnimationLockTime.json
@@ -91,10 +91,11 @@
   "3595": 0.6,
   "3596": 0.1,
   "3600": 0.6,
-  "3601": 0.6,
+  "3601": 0.1,
+  "3603": 0.1,
   "3606": 0.6,
   "3608": 0.6,
-  "3610": 0.1,
+  "3610": 0.6,
   "3612": 0.6,
   "3614": 0.6,
   "3615": 0.1,
@@ -130,6 +131,7 @@
   "7399": 0.6,
   "7400": 0.6,
   "7402": 0.6,
+  "7403": 0.6,
   "7404": 0.6,
   "7406": 0.6,
   "7407": 0.6,
@@ -206,6 +208,7 @@
   "16478": 0.8,
   "16479": 0.6,
   "16480": 1.5,
+  "16489": 0.6,
   "16493": 0.6,
   "16495": 0.6,
   "16498": 0.6,
@@ -222,6 +225,9 @@
   "17215": 0.1,
   "18806": 0.35,
   "18807": 0.35,
+  "18873": 0.6,
+  "18877": 0.6,
+  "18881": 0.6,
   "19004": 0.6,
   "19012": 0.6,
   "19297": 0.6,
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
index b2276fe7f..1b8ddfe8d 100644
--- a/RotationSolver.Basic/DataCenter.cs
+++ b/RotationSolver.Basic/DataCenter.cs
@@ -281,15 +281,23 @@ public static float DPSTaken
     {
         get
         {
-            var recs = _damages.Where(r => DateTime.Now - r.ReceiveTime < TimeSpan.FromMilliseconds(5));
+            try
+            {
+                var recs = _damages.Where(r => DateTime.Now - r.ReceiveTime < TimeSpan.FromMilliseconds(5));
+
+                if (!recs.Any()) return 0;
+
+                var damages = recs.Sum(r => r.Ratio);
 
-            if(!recs.Any()) return 0;
-            
-            var damages = recs.Sum(r => r.Ratio);
+                var time = recs.Last().ReceiveTime - recs.First().ReceiveTime + TimeSpan.FromMilliseconds(2.5f);
 
-            var time = recs.Last().ReceiveTime - recs.First().ReceiveTime + TimeSpan.FromMilliseconds(2.5f);
+                return damages / (float)time.TotalSeconds;
 
-            return damages / (float)time.TotalSeconds;
+            }
+            catch
+            {
+                return 0;
+            }
         }
     }