IPA started sending None when the device is not found. Change-Id: Ibeef33ff9a0acdb7c605bc46ef9e5d203c7aaa6d