'null' everywhere is something to be ashamed of, fix it