From 13dee36e935d026d236da35753cce62da5c8ee9a Mon Sep 17 00:00:00 2001
From: Ivan Tivonenko <darkdarkdragon@gmail.com>
Date: Thu, 23 Jul 2015 22:44:28 +0300
Subject: [PATCH] propagate message from remote error to RippledNetworkError

---
 src/api/server/server.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/api/server/server.js b/src/api/server/server.js
index ca5eb258..f2b5c9f7 100644
--- a/src/api/server/server.js
+++ b/src/api/server/server.js
@@ -28,7 +28,9 @@ function isConnected(): boolean {
 function getServerInfo(callback: (err: any, data: any) => void): void {
   this.remote.requestServerInfo((error, response) => {
     if (error) {
-      callback(new common.errors.RippledNetworkError(error.message));
+      const message = error && error.remote && error.remote.error_message?
+        error.remote.error_message : error.message;
+      callback(new common.errors.RippledNetworkError(message));
     } else {
       callback(null, response.info);
     }