From a7557a9626c59a63eb002e2ec108bcf3c1bca46a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 24 Jul 2013 15:20:59 +0800
Subject: [PATCH] Do not end the process when other exception occurs.

---
 browser/default_app/main.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/browser/default_app/main.js b/browser/default_app/main.js
index f5cc2973741..fdf33882e74 100644
--- a/browser/default_app/main.js
+++ b/browser/default_app/main.js
@@ -5,11 +5,16 @@ var path = require('path');
 // Start the specified app if there is one specified in command line, otherwise
 // start the default app.
 if (argv._.length > 0) {
-  process.on('uncaughtException', function() {
-    process.exit(1);
-  });
-
-  require(path.resolve(argv._[0]));
+  try {
+    require(path.resolve(argv._[0]));
+  } catch(e) {
+    if (e.code == 'MODULE_NOT_FOUND') {
+      console.error('Specified app is invalid');
+      process.exit(1);
+    } else {
+      throw e;
+    }
+  }
 } else {
   require('./default_app.js');
 }