am f8ddb166: Merge "Fix error and message handler with thunking. Also fix null check with equals."

* commit 'f8ddb16655e250b2e81efb9263b90a143f6e3ef3':
  Fix error and message handler with thunking. Also fix null check with equals.