am 529bb75f: am 04016450: am 9137d65e: Merge "Improve the "device \'(null)\' not found" error."

* commit '529bb75f9ff4a36788babb6666e0bb17ab8f99c1':
  Improve the "device '(null)' not found" error.