Merge "Fix NPE on reading data"