Handle empty name
Merged