Allow for null keys.
C787-2009?