diff --git a/lib/Constants.ts b/lib/Constants.ts
new file mode 100644
index 00000000..a5a3d222
--- /dev/null
+++ b/lib/Constants.ts
@@ -0,0 +1,2 @@
+// Used by buildProxyBypassRegexFromEnv for escaping dot symbols in NO_PROXY hosts' strings
+export const searchRegExpToReplaceSpecialChars: RegExp = new RegExp('(?<!\\\\)([.])(?!\\*)', 'g');
diff --git a/lib/Util.ts b/lib/Util.ts
index 0bd59929..4df029d9 100644
--- a/lib/Util.ts
+++ b/lib/Util.ts
@@ -6,6 +6,7 @@ import * as url from 'url';
 import * as path from 'path';
 import zlib = require('zlib');
 import { IRequestQueryParams, IHttpClientResponse } from './Interfaces';
+import { searchRegExpToReplaceSpecialChars } from './Constants';
 
 /**
  * creates an url from a request url and optional base url (http://server:8080)
@@ -107,17 +108,15 @@ export async function decompressGzippedContent(buffer: Buffer, charset?: string)
  * @return {RegExp}
  */
 export function buildProxyBypassRegexFromEnv(bypass : string) : RegExp {
-    try {
-        // We need to keep this around for back-compat purposes
-        return new RegExp(bypass, 'i')    
-    }
-    catch(err) {
-        if (err instanceof SyntaxError && (bypass || "").startsWith("*")) {            
-            let wildcardEscaped = bypass.replace('*', '(.*)');
-            return new RegExp(wildcardEscaped, 'i');
-        }
-        throw err;
+    // check if expression starts with asterisk and replace it with .*
+    if (bypass && bypass.startsWith("*")) {
+        bypass = bypass.replace("*", ".*");
     }
+
+    // replace all . symbols in string by \. because point is a special character
+    const safeRegex = (bypass || "").replace(searchRegExpToReplaceSpecialChars, '\\$1');
+
+    return new RegExp(safeRegex, 'i');
 }
 
 /**
diff --git a/package-lock.json b/package-lock.json
index 1ceb6e5f..30d13d05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "typed-rest-client",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cb003c7b..62d90e46 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typed-rest-client",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "description": "Node Rest and Http Clients for use with TypeScript",
   "main": "./RestClient.js",
   "scripts": {
diff --git a/test/package-lock.json b/test/package-lock.json
index 79a7d425..91818d4c 100644
--- a/test/package-lock.json
+++ b/test/package-lock.json
@@ -50,9 +50,9 @@
           "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
         },
         "object-inspect": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
-          "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+          "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
         },
         "qs": {
           "version": "6.10.1",
@@ -78,9 +78,9 @@
           "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
         },
         "underscore": {
-          "version": "1.12.1",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
-          "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+          "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
         }
       }
     }
diff --git a/test/units/utiltests.ts b/test/units/utiltests.ts
index e5acff46..af90e5bf 100644
--- a/test/units/utiltests.ts
+++ b/test/units/utiltests.ts
@@ -41,6 +41,28 @@ describe('Util Tests', function () {
             assert.equal(bypassed, true);
         });       
 
-    });
+        it('not bypasses if domain pattern starts with .', () => {
+            let regExp = util.buildProxyBypassRegexFromEnv('.intranet');
+            assert(regExp, 'regExp should not be null');
+            let parsedUrl = url.parse("https://keyvault.vault.azure.net/secrets/test-secret1-intranet");
+            let bypassed = regExp.test(parsedUrl.href);
+            assert.equal(bypassed, false);
+        });
+
+        it('bypasses if domain pattern starts with .', () => {
+            let regExp = util.buildProxyBypassRegexFromEnv('.net');
+            assert(regExp, 'regExp should not be null');
+            let parsedUrl = url.parse("https://keyvault.vault.azure.net/secrets/test-secret1-intranet");
+            let bypassed = regExp.test(parsedUrl.href);
+            assert.equal(bypassed, true);
+        });
 
-});
\ No newline at end of file
+        it('bypasses if domain pattern starts with . and contains complex domain', () => {
+            let regExp = util.buildProxyBypassRegexFromEnv('.azure.net');
+            assert(regExp, 'regExp should not be null');
+            let parsedUrl = url.parse("https://keyvault.vault.azure.net/secrets/test-secret1-intranet");
+            let bypassed = regExp.test(parsedUrl.href);
+            assert.equal(bypassed, true);
+        });
+    });
+});