Fix legend handling for null
Merge pull request #227 from isuftin/NAWQAAN-307

Fix legend handling for null