servicemanager: add sanity check in destructor am: 130242db90
am: 516e4af7c9

Change-Id: Ie4920a33ffb78a24bc6913391f672e903026974e