Avoid assertion failure if group has been disabled

Change-Id: I918f2716778ddd9ede56b5df731a531f97a3b24d
Add some more logging

Change-Id: I637c365626242142a0f6fc0ac002fa9dd5f1340a