Add empty key check for every key (in some way)

Add empty key check for every key (in some way) #4047