Small fix to restore NULL check on label because BP need it