Merge "Fixes NPE when child is null." into main