Added response checking