Fix for ONOS-393 - NPE when one of the devices can no longer be found

Change-Id: I5c907d8124585f9af5b3f6e7315c41cbcdd03fb9