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