BS-8876
Fix exception