BS-2436, add more warning and clean logs