In the end, it's better to check if the key exists, although it always should, that's what the key is for.... (cherry picked from commit a60db3ce)
