Exeption in service client added.
small refactoring.