[#61] Add more specific messages