logging / exception handling change