4 files changed, 31 insertions, 7 deletions

diff --git a/caldav.js b/caldav.js
index 7f3d367..fda846e 100644
--- a/caldav.js
+++ b/caldav.js
@@ -2527,7 +2527,8 @@ function write (chunk) {
 
     oncomplete: function() {
       var propstat = this.stack[this.stack.length - 1];
-      propstat = propstat.propstat;
+      var hash = propstat.propstat;
+
       var key;
       var status = this.current.status;
       var props = this.current.prop;
@@ -2535,14 +2536,21 @@ function write (chunk) {
       delete this.current.status;
       delete this.current.prop;
 
+      var hasProps = false;
+
       for (key in props) {
+        hasProps = true;
         if (Object.hasOwnProperty.call(props, key)) {
-          propstat[key] = {
+          hash[key] = {
             status: status,
             value: props[key]
           };
         }
       }
+
+      if (!hasProps) {
+        propstat.propstat = false;
+      }
     }
   });
 
diff --git a/lib/caldav/sax/dav_response.js b/lib/caldav/sax/dav_response.js
index 69a4368..f168d97 100644
--- a/lib/caldav/sax/dav_response.js
+++ b/lib/caldav/sax/dav_response.js
@@ -165,7 +165,8 @@
 
     oncomplete: function() {
       var propstat = this.stack[this.stack.length - 1];
-      propstat = propstat.propstat;
+      var hash = propstat.propstat;
+
       var key;
       var status = this.current.status;
       var props = this.current.prop;
@@ -173,14 +174,21 @@
       delete this.current.status;
       delete this.current.prop;
 
+      var hasProps = false;
+
       for (key in props) {
+        hasProps = true;
         if (Object.hasOwnProperty.call(props, key)) {
-          propstat[key] = {
+          hash[key] = {
             status: status,
             value: props[key]
           };
         }
       }
+
+      if (!hasProps) {
+        propstat.propstat = false;
+      }
     }
   });
 
diff --git a/samples/xml/propget.xml b/samples/xml/propget.xml
index 2db1aa2..dd20c91 100644
--- a/samples/xml/propget.xml
+++ b/samples/xml/propget.xml
@@ -2,6 +2,13 @@
 <D:multistatus xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 
   <D:response>
+    <D:href>/calendar/fake/</D:href>
+    <D:propstat>
+      <D:status>HTTP/1.1 404 Not Found</D:status>
+    </D:propstat>
+  </D:response>
+
+  <D:response>
 
     <D:href>/calendar/user/</D:href>
 
diff --git a/test/caldav/sax/dav_response_test.js b/test/caldav/sax/dav_response_test.js
index 3825043..dd2ecdd 100644
--- a/test/caldav/sax/dav_response_test.js
+++ b/test/caldav/sax/dav_response_test.js
@@ -83,8 +83,9 @@ suite('caldav/sax/dav_response', function() {
     });
 
     expected = {
-      '/calendar/user/': {
+      '/calendar/fake/': false,
 
+      '/calendar/user/': {
         'principal-URL': {
           status: '200',
           value: {
@@ -135,7 +136,7 @@ suite('caldav/sax/dav_response', function() {
             '/calendar/user/',
             expected['/calendar/user/']
           ],
-          response[0],
+          response[1],
           '/calendar/user/ response'
         );
 
@@ -144,7 +145,7 @@ suite('caldav/sax/dav_response', function() {
             '/calendar/other',
             expected['/calendar/other']
           ],
-          response[1],
+          response[2],
           '/calendar/other/ response'
         );