Add status code checking