Added some error messages / UI features