Fix of null objects