Fix for null keys/values in hashes