Add null check on AbstractHttpClient