Merge "Improve the "device '(null)' not found" error."