Fixed locking problem with serviceException (#10569)

Change-Id: I363ac3508f558769a79098572cb268cadfc4b1e2