fix #4464: NPE with new bugfix release
Merge pull request #4466 from samueltardieu/issue-4464

fix #4464: NPE with new bugfix release