diff --git a/binding.gyp b/binding.gyp
index f378799..9b68435 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -3,8 +3,12 @@
         "sapnwrfcsdk_path_linux": "$(SAPNWRFC_HOME)",
         "sapnwrfcsdk_path_windows": "<!(echo %SAPNWRFC_HOME%)",
         "build_dir": '<(PRODUCT_DIR)',
+        "PLATFORM": 'win32',
         "conditions": [
-            ['OS=="win"', {"build_dir": "<(PRODUCT_DIR)/../win32_x64"}]
+            ['OS=="win"', {"build_dir": "<(PRODUCT_DIR)/../win32_x64"}],
+            ['OS=="win"', {"PLATFORM": "win32"}],
+            ['OS=="linux"', {"PLATFORM": "linux"}],
+            ['OS=="mac"', {"PLATFORM": "mac"}]
         ]
     },
     "targets": [
@@ -142,6 +146,10 @@
                 {
                     "files": ["<(build_dir)/<(module_name).node"],
                     "destination": "<(module_path)"
+                },
+                {
+                    "files": ["<(build_dir)/<(module_name).node"],
+                    "destination": "./lib/binding/<(PLATFORM)-<(target_arch)"
                 }
             ]
         }
diff --git a/lib/wrapper/sapnwrfc-client.js b/lib/wrapper/sapnwrfc-client.js
index 1d61e85..7baf204 100644
--- a/lib/wrapper/sapnwrfc-client.js
+++ b/lib/wrapper/sapnwrfc-client.js
@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const Promise = require("bluebird");
 const binary = require('node-pre-gyp');
+const validation = require('node-pre-gyp/lib/util/versioning');
 const path = require('path');
-const binding_path = binary.find(path.resolve(path.join(__dirname, '../../package.json')));
+const packageJsonPath = path.resolve(path.join(__dirname, '../../package.json'));
+let binding_path = binary.find(packageJsonPath);
 let binding;
 try {
     binding = require(binding_path);
@@ -13,7 +15,22 @@ catch (ex) {
         ex.message += ['win32', 'linux', 'darwin'].indexOf(process.platform) !== -1 ?
             '\n\n The SAP NW RFC SDK could not be loaded, check the installation: http://sap.github.io/node-rfc/install.html#sap-nw-rfc-sdk-installation' :
             `\n\nPlatform not supported: ${process.platform}`;
-    throw ex;
+    ex.message += "\n\nSearchPath: " + binding_path;
+    const packageJson = require(packageJsonPath);
+    packageJson.binary.module_path = packageJson.binary.module_path_wout_abi;
+    binding_path = validation.evaluate(packageJson, { module_root: path.dirname(packageJsonPath) }, 'v69').module;
+    try {
+        binding = require(binding_path);
+    }
+    catch (ex2) {
+        if (ex2.message.indexOf('sapnwrfc.node') !== -1)
+            ex2.message += ['win32', 'linux', 'darwin'].indexOf(process.platform) !== -1 ?
+                '\n\n The SAP NW RFC SDK could not be loaded, check the installation: http://sap.github.io/node-rfc/install.html#sap-nw-rfc-sdk-installation' :
+                `\n\nPlatform not supported: ${process.platform}`;
+        ex2.message += "\n\nSearchPath: " + binding_path;
+        ex2.message += ex.message;
+        throw ex2;
+    }
 }
 var EnumSncQop;
 (function (EnumSncQop) {
diff --git a/lib/wrapper/sapnwrfc-client.js.map b/lib/wrapper/sapnwrfc-client.js.map
index 38e6cdd..5aba5f6 100644
--- a/lib/wrapper/sapnwrfc-client.js.map
+++ b/lib/wrapper/sapnwrfc-client.js.map
@@ -1 +1 @@
-{"version":3,"file":"sapnwrfc-client.js","sourceRoot":"","sources":["../../src/ts/wrapper/sapnwrfc-client.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"sapnwrfc-client.js","sourceRoot":"","sources":["../../src/ts/wrapper/sapnwrfc-client.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index c01e32e..0e2b94d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "node-rfc",
-  "version": "1.0.0-rc10",
+  "version": "1.0.0-rc11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -930,9 +930,9 @@
       }
     },
     "chownr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
+      "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
     },
     "ci-info": {
       "version": "2.0.0",
@@ -3385,9 +3385,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "lodash.sortby": {
@@ -3549,9 +3549,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -3637,9 +3637,9 @@
       "dev": true
     },
     "node-addon-api": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.3.tgz",
-      "integrity": "sha512-FXWH6mqjWgU8ewuahp4spec8LkroFZK2NicOv6bNwZC3kcwZUI8LeZdG80UzTSLLhK4T7MsgNwlYDVRlDdfTDg=="
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.1.tgz",
+      "integrity": "sha512-2+DuKodWvwRTrCfKOeR24KIc5unKjOh8mz17NCzVnHWfjAdDqbfbjqh7gUT+BkXBRQM52+xCHciKWonJ3CbJMQ=="
     },
     "node-int64": {
       "version": "0.4.0",
@@ -3719,9 +3719,9 @@
       "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="
     },
     "npm-packlist": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
-      "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz",
+      "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==",
       "requires": {
         "ignore-walk": "^3.0.1",
         "npm-bundled": "^1.0.1"
@@ -4416,9 +4416,9 @@
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -4818,17 +4818,17 @@
       "dev": true
     },
     "tar": {
-      "version": "4.4.8",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-      "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz",
+      "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==",
       "requires": {
         "chownr": "^1.1.1",
         "fs-minipass": "^1.2.5",
-        "minipass": "^2.3.4",
-        "minizlib": "^1.1.1",
+        "minipass": "^2.3.5",
+        "minizlib": "^1.2.1",
         "mkdirp": "^0.5.0",
         "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.2"
+        "yallist": "^3.0.3"
       }
     },
     "test-exclude": {
@@ -4979,38 +4979,15 @@
       }
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "unset-value": {
diff --git a/package.json b/package.json
index 0b65cc4..a8de7ce 100755
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   "binary": {
     "module_name": "sapnwrfc",
     "module_path": "./lib/binding/{platform}-{arch}-{node_abi}",
+    "module_path_wout_abi": "./lib/binding/{platform}-{arch}",
     "host": "https://github.com/SAP/node-rfc/releases/download/",
     "remote_path": "{version}",
     "package_name": "rfc-{platform}-{arch}-{node_abi}.tar.gz"
@@ -72,7 +73,7 @@
   "dependencies": {
     "@types/bluebird": "^3.5.27",
     "bluebird": "^3.5.5",
-    "node-addon-api": "^1.6.3",
+    "node-addon-api": "^1.7.1",
     "node-pre-gyp": "^0.12.0"
   }
 }
diff --git a/src/ts/wrapper/sapnwrfc-client.ts b/src/ts/wrapper/sapnwrfc-client.ts
index b0ebdbf..5f5d068 100644
--- a/src/ts/wrapper/sapnwrfc-client.ts
+++ b/src/ts/wrapper/sapnwrfc-client.ts
@@ -1,10 +1,12 @@
 /// <reference types="node" />
 
 import * as Promise from 'bluebird';
+import * as fs from 'fs';
 const binary = require('node-pre-gyp');
+const validation = require('node-pre-gyp/lib/util/versioning');
 const path = require('path');
-const binding_path = binary.find(path.resolve(path.join(__dirname, '../../package.json')));
-
+const packageJsonPath = path.resolve(path.join(__dirname, '../../package.json'));
+let binding_path = binary.find(packageJsonPath);
 let binding: RfcClientBinding;
 try {
 	binding = require(binding_path);
@@ -13,7 +15,21 @@ try {
 		ex.message += ['win32', 'linux', 'darwin'].indexOf(process.platform) !== -1 ?
 			'\n\n The SAP NW RFC SDK could not be loaded, check the installation: http://sap.github.io/node-rfc/install.html#sap-nw-rfc-sdk-installation' :
 			`\n\nPlatform not supported: ${process.platform}`;
-	throw ex;
+	ex.message += "\n\nSearchPath: " + binding_path;
+	const packageJson = require(packageJsonPath);
+    packageJson.binary.module_path = packageJson.binary.module_path_wout_abi;
+    binding_path = validation.evaluate(packageJson, { module_root: path.dirname(packageJsonPath)}, 'v69').module;
+	try {
+		binding = require(binding_path);
+	} catch (ex2) {
+		if (ex2.message.indexOf('sapnwrfc.node') !== -1)
+			ex2.message += ['win32', 'linux', 'darwin'].indexOf(process.platform) !== -1 ?
+				'\n\n The SAP NW RFC SDK could not be loaded, check the installation: http://sap.github.io/node-rfc/install.html#sap-nw-rfc-sdk-installation' :
+				`\n\nPlatform not supported: ${process.platform}`;
+		ex2.message += "\n\nSearchPath: " + binding_path;
+		ex2.message += ex.message;
+		throw ex2;
+	}
 }
 interface RfcConnectionInfo {
 	host: string;