Prevent persistent temp file creation
Cleanup a bit and prevent crash with log