Add more appropriate messages