fixed null user issue