Fix NPE in PDE, affecting color picker and other Tools.
Merge pull request #2425 from jdf/master

Fix NPE in PDE, affecting color picker and other Tools.