Fix leak in error condition
Reduce much more logs