ONOS-6667
NullPointerException on device-remove
Change-Id: I5bc41227a0535b73cb3969a584f8affc736ae6cc
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
index 21e85c8..214553e 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
@@ -453,11 +453,11 @@
.put("online", deviceService.isAvailable(device.id()))
.put("master", master(device.id()))
.put("layer", device.layer());
-
Device d = device.backingDevice();
-
- addProps(node, d);
- addGeoGridLocation(node, d);
+ if (d != null) {
+ addProps(node, d);
+ addGeoGridLocation(node, d);
+ }
addMetaUi(node, ridStr, device.idAsString());
return node;