Adding null check for keys
Updating version