fix #4464: NPE with new bugfix release

fix #4464: NPE with new bugfix release

Please check before merging.