Fix: NullPointer on 'everything else' mapping