Another fix user null