Fix error and message handler with thunking. Also fix null check with equals.

Change-Id: I3f05d3dfcbcfac679ce91feb3459ceb177c60161
2 files changed