BS-11552: Provide more trace when the issue occurs