Rework error handling and shorten messages