Intend to backport OAK-6351

[Marcel Reutegger]

Hi

I'd like to backport OAK-6351 to the maintenance branches. It is a minor 
improvement, but also includes a fix for a potential NPE. As reported in the 
issue, it indeed happened recently on a running system.

Regards
 Marcel