diff --git a/src/TesiraDsp.cs b/src/TesiraDsp.cs
index 1576b10..62dc608 100644
--- a/src/TesiraDsp.cs
+++ b/src/TesiraDsp.cs
@@ -119,7 +119,11 @@ public bool IsSubscribed {
 
         public DeviceInfo DeviceInfo
         {
-            get { return DevInfo.DeviceInfo; }
+            get {
+                if (DevInfo != null) return DevInfo.DeviceInfo;
+            
+                else return new DeviceInfo();
+            }
         }
 
         /// <summary>