fix NullPointerException & rename groupId