Further logging imrovement. Exception logging added