Fix: Account for data being `undefined`