ESDEV-899 Solve "Black Friday" problem Added return value