diff --git a/src/jquery.URI.js b/src/jquery.URI.js
index 59dddecc..394e8316 100644
--- a/src/jquery.URI.js
+++ b/src/jquery.URI.js
@@ -145,14 +145,14 @@ $.fn.uri = function(uri) {
         }
         
         if (!(uri instanceof URI)) {
-            uri = URI(uri);
+            uri = URI(uri || '');
         }
     } else {
         uri = $this.data('uri');
         if (uri) {
             return uri;
         } else {
-    		uri = URI($this.attr(property));
+    		uri = URI($this.attr(property) || '');
         }
     }
     
@@ -243,4 +243,4 @@ $.expr[":"].uri = uriSizzle;
 
 // extending existing object rather than defining something new
 return {};
-}));
\ No newline at end of file
+}));