Merge "Don't crash if account label is null" into klp-dev