VID-539 Move this into the if() that checks for success