Fixed another NPE relating to Fireworks.