Fix two issues with previous commit where we didn't even enter the new code path.
Fix two issues with previous commit where we didn't even enter the new code path.

adobe-research/svgObjectModelGenerator,mcanthony/svgObjectModelGenerator,adobe-research/svgObjectModelGenerator,mcanthony/svgObjectModelGenerator