Fix messaging (contain Error warning)