diff --git a/Assets/Temp/Scripts/Mastermanagement.cs b/Assets/Temp/Scripts/Mastermanagement.cs
index 781fdaa7..9b6fb0d2 100644
--- a/Assets/Temp/Scripts/Mastermanagement.cs
+++ b/Assets/Temp/Scripts/Mastermanagement.cs
@@ -88,7 +88,7 @@ public class Mastermanagement : MonoBehaviour
             //    DroneViewDisplay.Instance.DistroyUI(equipmentCommon.deviceID);
             //}
             weapongames.Remove(obj);
-            DeviceManager.Instance.RemoveDevice(obj);
+            //DeviceManager.Instance.RemoveDevice(obj);
             if (obj.GetComponent<UnmannedAerialVehicleManage>())
                 FormationManager.Instance.RemoveAppointWRJ(obj.GetComponent<UnmannedAerialVehicleManage>());
             Destroy(obj);
diff --git a/Assets/Zion/Scripts/Adam/FormationManager.cs b/Assets/Zion/Scripts/Adam/FormationManager.cs
index c0114922..7a666623 100644
--- a/Assets/Zion/Scripts/Adam/FormationManager.cs
+++ b/Assets/Zion/Scripts/Adam/FormationManager.cs
@@ -209,7 +209,7 @@ public class FormationManager : MonoSingleton<FormationManager>
     public void RemoveAppointWRJ(UnmannedAerialVehicleManage uavm)
     {
         List<UnmannedAerialVehicleManage> uavms = GroupUAVM(uavm.groupId);
-        if (uavms.Count == 0) return;
+        if (uavms==null||uavms.Count == 0) return;
         if (uavms.Contains(uavm))
             uavms.Remove(uavm);
         if (allUavms.Contains(uavm))