Merge "Avoid NullPointerException"