Fix NULL to a string
Fix missing return