diff --git a/src/groups.js b/src/groups.js
index e4f0a3169..02a3f5aab 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -214,16 +214,15 @@ async function update(id, data) {
     assert.strictEqual(typeof id, 'string');
     assert(data && typeof data === 'object');
 
-    let error;
     if ('name' in data) {
         assert.strictEqual(typeof data.name, 'string');
-        error = validateGroupname(data.name);
+        const error = validateGroupname(data.name);
         if (error) throw error;
     }
 
-    let args = [ ];
-    let fields = [ ];
-    for (let k in data) {
+    const args = [];
+    const fields = [];
+    for (const k in data) {
         if (k === 'name') {
             assert.strictEqual(typeof data.name, 'string');
             fields.push(k + ' = ?');
@@ -232,9 +231,8 @@ async function update(id, data) {
     }
     args.push(id);
 
-    let result;
-    [error, result] = safe(database.query('UPDATE userGroups SET ' + fields.join(', ') + ' WHERE id = ?', args));
-    if (error && error.code === 'ER_DUP_ENTRY' && error.sqlMessage.indexOf('userGroups_name') !== -1) throw new BoxError(BoxError.ALREADY_EXISTS, 'name already exists');
-    if (error) throw error;
+    const [updateError, result] = await safe(database.query('UPDATE userGroups SET ' + fields.join(', ') + ' WHERE id = ?', args));
+    if (updateError && updateError.code === 'ER_DUP_ENTRY' && updateError.sqlMessage.indexOf('userGroups_name') !== -1) throw new BoxError(BoxError.ALREADY_EXISTS, 'name already exists');
+    if (updateError) throw updateError;
     if (result.affectedRows !== 1) throw new BoxError(BoxError.NOT_FOUND, 'Group not found');
 }