change handling of legend labels which are None

Fixes #1610