Fix: null check for value from valueForKeyPath