TOTHAA-116
* improved logging