user story #1447 - Fixing backup errors

Change-Id: I8ed7123f17929dfdc25af74b056ae939387994ed