Fixed null problem.