diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 96436055ffcee5..99489d2e7d8589 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -157,6 +157,7 @@ rules:
   }]
   no-tabs: error
   no-trailing-spaces: error
+  no-unsafe-finally: error
   object-curly-spacing: [error, always]
   one-var-declaration-per-line: error
   operator-linebreak: [error, after]
diff --git a/lib/timers.js b/lib/timers.js
index 46cd770fc643bd..c82d6cfdbb11e9 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -314,24 +314,24 @@ function tryOnTimeout(timer, list) {
       }
     }
 
-    if (!threw) return;
-
-    // Postpone all later list events to next tick. We need to do this
-    // so that the events are called in the order they were created.
-    const lists = list._unrefed === true ? unrefedLists : refedLists;
-    for (var key in lists) {
-      if (key > list.msecs) {
-        lists[key].nextTick = true;
+    if (threw) {
+      // Postpone all later list events to next tick. We need to do this
+      // so that the events are called in the order they were created.
+      const lists = list._unrefed === true ? unrefedLists : refedLists;
+      for (var key in lists) {
+        if (key > list.msecs) {
+          lists[key].nextTick = true;
+        }
       }
+      // We need to continue processing after domain error handling
+      // is complete, but not by using whatever domain was left over
+      // when the timeout threw its exception.
+      const domain = process.domain;
+      process.domain = null;
+      // If we threw, we need to process the rest of the list in nextTick.
+      process.nextTick(listOnTimeoutNT, list);
+      process.domain = domain;
     }
-    // We need to continue processing after domain error handling
-    // is complete, but not by using whatever domain was left over
-    // when the timeout threw its exception.
-    const domain = process.domain;
-    process.domain = null;
-    // If we threw, we need to process the rest of the list in nextTick.
-    process.nextTick(listOnTimeoutNT, list);
-    process.domain = domain;
   }
 }
 
diff --git a/test/common/index.js b/test/common/index.js
index eb4d5a5251cab8..165014e585c49f 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -514,21 +514,13 @@ exports.canCreateSymLink = function() {
     const whoamiPath = path.join(process.env.SystemRoot,
                                  'System32', 'whoami.exe');
 
-    let err = false;
-    let output = '';
-
     try {
-      output = execSync(`${whoamiPath} /priv`, { timout: 1000 });
+      const output = execSync(`${whoamiPath} /priv`, { timout: 1000 });
+      return output.includes('SeCreateSymbolicLinkPrivilege');
     } catch (e) {
-      err = true;
-    } finally {
-      if (err || !output.includes('SeCreateSymbolicLinkPrivilege')) {
-        return false;
-      }
+      return false;
     }
   }
-
-  return true;
 };
 
 exports.getCallSite = function getCallSite(top) {