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

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