Add title & improve error messages