diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.h b/SoObjects/Appointments/SOGoAppointmentFolder.h
index cfae7e2f5..ab1a1bd07 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -195,7 +195,7 @@ typedef enum {
                          startDate: (NSCalendarDate **) theStartDate
                            endDate: (NSCalendarDate **) theEndDate;
 
-- (void) setDavDescription:(NSString *)description;
+- (NSException *)setDavDescription:(NSString *)description;
 - (NSString *) davDescription;
 
 @end
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 935ade494..1a36ce16f 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2591,10 +2591,14 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   return componentSet;
 }
 
-- (void) setDavDescription: (NSString *) description
+- (NSException *) setDavDescription: (NSString *) description
 {
-  [self setFolderPropertyValue: description
+  if (description) {
+    [self setFolderPropertyValue: description
                     inCategory: @"DavDescription"];
+  }
+
+  return nil;
 }
 
 - (NSString *) davDescription