Merge "Adding check to ensure device exists before setting pointer type."