Add check for NPE on missing FX list