Merge "Fix the potential NullPointerException."