Move the logging statements into the block, so that they report the correct thread

Addresses #377
Modify the save options if necessary