Additional checks to determine job was aborted to avoid race conditions

Added ServerId and WorkerNumber checks.