BS-9159
Fix error on save