Fix for 500 error on group modification.

Bug: 967799
Change-Id: I39e31ddf8e6278cabe48fc3b40d9a247a8c66be4