fixed another null problem