BI-320
Improve error log