Inmprove error logging
Improve logger a lot