Fix the NullReference