Improve reporting and waiting for Subjob creation/completion race condition