Added extra validation to completions rather than post completion cleanups