am c417d0a5: Merge "Make error messages even better!"

* commit 'c417d0a5cd0743d691fc63cc1007979b836945a0':
  Make error messages even better!