FS-3194 see comitted patch. I made the function assert rather than tolerate NULL and fixed the imporper usage.