Added better null stringification support