diff --git a/common.gypi b/common.gypi
index 7c462e7eea..00fad438bc 100644
--- a/common.gypi
+++ b/common.gypi
@@ -10,6 +10,7 @@
   },
 
   'target_defaults': {
+    'default_configuration': 'Debug',
     'configurations': {
       'Debug': {
         'defines': [ 'DEBUG', '_DEBUG' ],
diff --git a/tools/gyp_addon b/tools/gyp_addon
index c47c37f25c..efa8f42b37 100755
--- a/tools/gyp_addon
+++ b/tools/gyp_addon
@@ -15,7 +15,8 @@ if __name__ == '__main__':
   config_gypi = os.path.join(node_root, 'config.gypi')
   args.extend(['-I', addon_gypi])
   args.extend(['-I', common_gypi])
-  args.extend(['-I', config_gypi])
+  if os.path.exists(config_gypi):
+    args.extend(['-I', config_gypi])
   args.extend(['-Dlibrary=shared_library'])
   args.extend(['-Dvisibility=default'])
   args.extend(['-Dnode_root_dir=%s' % node_root])