Merge "Add a null check in case device disappears." into pi-dev