diff --git a/script/coffeelint.py b/script/coffeelint.py
index 8bfd402bc4f8..4397e1a26304 100755
--- a/script/coffeelint.py
+++ b/script/coffeelint.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import errno
 import glob
 import os
 import subprocess
@@ -20,11 +21,14 @@ def main():
           glob.glob('common/api/lib/*.coffee') + \
           glob.glob('browser/atom/*.coffee')
 
-  if sys.platform in ['win32', 'cygwin']:
-    subprocess.check_call(['node', coffeelint] + settings + files,
-                          executable='C:/Program Files/nodejs/node.exe')
-  else:
+  try:
     subprocess.check_call(['node', coffeelint] + settings + files)
+  except OSError as e:
+    if e.errno == errno.ENOENT and sys.platform in ['win32', 'cygwin']:
+      subprocess.check_call(['node', coffeelint] + settings + files,
+                            executable='C:/Program Files/nodejs/node.exe')
+    else:
+      raise
 
 
 if __name__ == '__main__':
diff --git a/vendor/apm b/vendor/apm
index a9e5498a838b..90cd546860e9 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit a9e5498a838bf228fca53c32f66e2e6d5adcf783
+Subproject commit 90cd546860e9782ac8d0d5f7a35ab49d5d105a4e