Let's not assume API always responds

Change-Id: I3084b04d648a5f3be3f4016cb2951279cad70f29
Merge "Let's not assume API always responds"