--- 2.2.21/modules/dav/main/props.c	(revision 14743)
+++ 2.2.21/modules/dav/main/props.c	(revision 14744)
@@ -615,13 +615,14 @@ DAV_DECLARE(dav_get_props_result) dav_get_allprops
         if (propdb->db != NULL) {
             dav_xmlns_info *xi = dav_xmlns_create(propdb->p);
             dav_prop_name name;
+            dav_error *err;
 
             /* define (up front) any namespaces the db might need */
             (void) (*db_hooks->define_namespaces)(propdb->db, xi);
 
             /* get the first property name, beginning the scan */
-            (void) (*db_hooks->first_name)(propdb->db, &name);
-            while (name.ns != NULL) {
+            err = (*db_hooks->first_name)(propdb->db, &name);
+            while (err == NULL && name.ns != NULL) {
 
                 /*
                 ** We also look for <DAV:getcontenttype> and
@@ -640,7 +641,6 @@ DAV_DECLARE(dav_get_props_result) dav_get_allprops
                 }
 
                 if (what == DAV_PROP_INSERT_VALUE) {
-                    dav_error *err;
                     int found;
 
                     if ((err = (*db_hooks->output_value)(propdb->db, &name,
@@ -659,7 +659,7 @@ DAV_DECLARE(dav_get_props_result) dav_get_allprops
                 }
 
               next_key:
-                (void) (*db_hooks->next_name)(propdb->db, &name);
+                err = (*db_hooks->next_name)(propdb->db, &name);
             }
 
             /* all namespaces have been entered into xi. generate them into