Batch process debug removed + added one more check (can be removed when confirmation that this edge case never found)