Request error handling added