Added more error messages (All 5 tests passed)