diff --git a/Uri/UriFactory.js b/Uri/UriFactory.js
index dbcf79f..9774e5b 100644
--- a/Uri/UriFactory.js
+++ b/Uri/UriFactory.js
@@ -144,7 +144,7 @@ export class UriFactory
 
             let pars = [];
             for (const a in comps) {
-                if (comps.hasOwnProperty(a)) {
+                if (comps.hasOwnProperty(a) && comps[a] !== '' && comps[a] !== null) {
                     pars.push(a + '=' + comps[a]);
                 }
             }