Add fix to prevent NPE

As in 3.9, even if not really needed (should not be null)