BS-11779
Avoid additional error popup