Added error handling (400 / 404 response) module