Merge "Handle exception thrown by KCS.setGrant()"