Bug corrections in ServiceHandler

No match.