Merge "Fix NPE when load() returns nulls."