Added some null checking.
Support multi-part identifiers as the key.