Merge "Fix NPE in onTrustError method"