fixed null exception