Added more error messages and another table