Fix typo
Fix check null on String key and add check on empty key