Add more error messages handling