1 files changed, 6 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.SystemInfo/SystemObjectsCollection.cs b/Software/Visual_Studio/Tango.SystemInfo/SystemObjectsCollection.cs
index 92937f561..0596b5745 100644
--- a/Software/Visual_Studio/Tango.SystemInfo/SystemObjectsCollection.cs
+++ b/Software/Visual_Studio/Tango.SystemInfo/SystemObjectsCollection.cs
@@ -23,10 +23,13 @@ namespace Tango.SystemInfo
 
             str += Name + "\n\n";
 
-            foreach (var obj in Objects)
+            if (Objects != null)
             {
-                str += obj.ToString();
-                str += "\n";
+                foreach (var obj in Objects)
+                {
+                    str += obj.ToString();
+                    str += "\n";
+                }
             }
 
             str += "\n";