diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs
index d8a72e05..892b89f0 100644
--- a/Assets/Zion/Scripts/Adam/DeviceManager.cs
+++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs
@@ -86,7 +86,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
         List<GameObject> temp = new List<GameObject>();
         for (int i = 0; i < devices.Count; i++)
         {
-            if (devices[i].isPlayer)
+            if (devices[i] != null && devices[i].isPlayer)
             {
                 temp.Add(devices[i].gameObject);
             }