[~TASK] Fixed error messages