LPS-43103 The name could be null
Revert "LPS-43103 The name could be null"

This reverts commit 04bc06f002db4c01fe1fb36c839e5f307185c94f.
LPS-43117