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

* commit '0401645033b0418f9cd6e07768ae3b062aa256ca':
  Improve the "device '(null)' not found" error.