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

* commit '9137d65e9ba7e8a83440e1e2058ad19b2d6b6434':
  Improve the "device '(null)' not found" error.