Merge "Fix latent NPE issues."