Merge "Fix NullPointerException bug"