Fixed some error handling, messages