error handeling on persistence
Merge branch 'aaa'