handle and use ServiceFault, bugfix

Ok. Let then add some tracing to log with CAPITAL letters about TODO before returning. To not forget about it. )