Better error handling in the scripts

Some container did a hard exit, so we didn't touch the done file. This will ensure that by creating a trap