* commit 'bee8ec2538c75797d9704617411f831945c8da54': Prevent NPE when no indicator is specified. Bug #3362349