Yeah, saw that part (nil possible from raw_content now).  And right, separate issue.