Merge "Avoid a potential NPE."