more complex response handling...

Change-Id: Ic54d290cc9fbedb2ff70cccc76d45f048929ab74