fixed the null problem
give a try