callContextAdapter Exception fixes

Change-Id: I72798097819b86a666b8575cdc006f00a07d597c