Added null-safe operator to device discovery