IDE-1341

Do the null check for the "name"