Merge "Avoid NPE"