Fixed a null problem