diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index 884c3d90a0..440795831a 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -151,18 +151,26 @@ void App::OnFinishLaunching() {
   Emit("ready");
 }
 
-base::FilePath App::GetPath(const std::string& name) {
+base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
+  bool succeed = false;
   base::FilePath path;
   int key = GetPathConstant(name);
   if (key >= 0)
-    PathService::Get(key, &path);
+    succeed = PathService::Get(key, &path);
+  if (!succeed)
+    args->ThrowError("Failed to get path");
   return path;
 }
 
-void App::SetPath(const std::string& name, const base::FilePath& path) {
+void App::SetPath(mate::Arguments* args,
+                  const std::string& name,
+                  const base::FilePath& path) {
+  bool succeed = false;
   int key = GetPathConstant(name);
   if (key >= 0)
-    PathService::Override(key, path);
+    succeed = PathService::Override(key, path);
+  if (!succeed)
+    args->ThrowError("Failed to set path");
 }
 
 void App::ResolveProxy(const GURL& url, ResolveProxyCallback callback) {
diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h
index 9b67cb5b71..41a820b7a7 100644
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -18,6 +18,10 @@ namespace base {
 class FilePath;
 }
 
+namespace mate {
+class Arguments;
+}
+
 namespace atom {
 
 namespace api {
@@ -49,11 +53,11 @@ class App : public mate::EventEmitter,
 
  private:
   // Get/Set the pre-defined path in PathService.
-  base::FilePath GetPath(const std::string& name);
-  void SetPath(const std::string& name, const base::FilePath& path);
+  base::FilePath GetPath(mate::Arguments* args, const std::string& name);
+  void SetPath(mate::Arguments* args,
+               const std::string& name,
+               const base::FilePath& path);
 
-  void SetDataPath(const base::FilePath& path);
-  base::FilePath GetDataPath();
   void ResolveProxy(const GURL& url, ResolveProxyCallback callback);
   void SetDesktopName(const std::string& desktop_name);
 
diff --git a/vendor/brightray b/vendor/brightray
index 8eb714dac7..f19c269ab9 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 8eb714dac77e3d3fd43fba76c835d29b838cc8be
+Subproject commit f19c269ab974f22f31782c0c395119130fb59b15