temporary NPE fix for ONOS-439

Change-Id: I238ea24e1a4c4bebb40d132d060c418f5675f570