fix #102 - Check if device model is present before requesting the cur…

…rent device model (#105)
CGI-FR · Jan 26, 2022 · e246d2f · e246d2f
1 parent 2e60553
commit e246d2f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor b/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
@@ -184,8 +184,11 @@
             Device = await Http.GetFromJsonAsync<DeviceDetails>($"api/Devices/{DeviceID}");
 
             // Gets the DeviceModel Name from the DeviceModel ID
-            DeviceModel model = await Http.GetFromJsonAsync<DeviceModel>($"api/DeviceModels/{Device.ModelId}");
-            Device.ModelName = model.Name;
+            if (!string.IsNullOrEmpty(Device.ModelId))
+            {
+                DeviceModel model = await Http.GetFromJsonAsync<DeviceModel>($"api/DeviceModels/{Device.ModelId}");
+                Device.ModelName = model?.Name;
+            }
 
             // StatusUpdatedTime set to string to have a more human-readable format
             StatusUpdatedTimeString = Device.StatusUpdatedTime.ToString();