Error handling for reply

Change-Id: I72a76b59119dc1b49633f2238564bd2255b73dcd