Fix a potential crash
Add a place holder for empty name