More logging, making things slightly more robust somehow (fixed a hang issue without knowing what actually fixed it..)