Hotfix for keys that not exits in the backend
Merge branch 'hotfix/no_dn_error'