--- 2.2.21/modules/dav/fs/dbm.c	(revision 14742)
+++ 2.2.21/modules/dav/fs/dbm.c	(revision 14743)
@@ -729,6 +729,9 @@ static dav_error * dav_propdb_get_rollback(dav_db
 static dav_error * dav_propdb_apply_rollback(dav_db *db,
                                              dav_deadprop_rollback *rollback)
 {
+    if (rollback == NULL)
+        return NULL; /* no rollback, nothing to do */
+
     if (rollback->value.dptr == NULL) {
         /* don't fail if the thing isn't really there. */
         (void) dav_dbm_delete(db, rollback->key);