From 1bd87c571a89d3f0fa32335c3f4b4058c5487f37 Mon Sep 17 00:00:00 2001
From: YingXue <yingxue@microsoft.com>
Date: Thu, 30 Apr 2020 09:03:16 -0700
Subject: [PATCH] fix null ref (#271)

---
 .../components/deviceInterfaces/deviceInterfaces.tsx     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/devices/deviceContent/components/deviceInterfaces/deviceInterfaces.tsx b/src/app/devices/deviceContent/components/deviceInterfaces/deviceInterfaces.tsx
index 59f7fc011..be1241fac 100644
--- a/src/app/devices/deviceContent/components/deviceInterfaces/deviceInterfaces.tsx
+++ b/src/app/devices/deviceContent/components/deviceInterfaces/deviceInterfaces.tsx
@@ -100,11 +100,16 @@ export default class DeviceInterfaces extends React.Component<DeviceInterfacePro
         );
     }
 
+    // tslint:disable-next-line: cyclomatic-complexity
     private readonly renderInterfaceInfoDetail = (context: LocalizationContextInterface) => {
         const { modelDefinitionWithSource } = this.props;
         const source = this.getModelDefinitionSourceText(context);
-        const displayName = modelDefinitionWithSource.payload && getLocalizedData(modelDefinitionWithSource.payload.modelDefinition.displayName) || '--';
-        const description = modelDefinitionWithSource.payload && getLocalizedData(modelDefinitionWithSource.payload.modelDefinition.description) || '--';
+        const displayName = modelDefinitionWithSource.payload &&
+            modelDefinitionWithSource.payload.modelDefinition &&
+            getLocalizedData(modelDefinitionWithSource.payload.modelDefinition.displayName) || '--';
+        const description = modelDefinitionWithSource.payload &&
+            modelDefinitionWithSource.payload.modelDefinition &&
+            getLocalizedData(modelDefinitionWithSource.payload.modelDefinition.description) || '--';
         return (
             <>
                 <Label className="source"> {context.t(ResourceKeys.deviceInterfaces.columns.source)}: {source}</Label>