Fixed an issue if key does not exist