Add looping after errors