diff --git a/ChangeLog b/ChangeLog
index dd7064e81..7b9d7666f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-08  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SOPE/GDLContentStore/GCSAlarmsFolder.m
+	We now check for non-nil values before calling
+	-timeInterval...
+
 2010-11-08  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/SOGoDragHandles.js (adjust): for vertical
diff --git a/SOPE/GDLContentStore/GCSAlarmsFolder.m b/SOPE/GDLContentStore/GCSAlarmsFolder.m
index 69c358840..be86a18b2 100644
--- a/SOPE/GDLContentStore/GCSAlarmsFolder.m
+++ b/SOPE/GDLContentStore/GCSAlarmsFolder.m
@@ -326,8 +326,10 @@ static NSString *alarmsFolderURLString = nil;
 {
   NSNumber *tRecId, *tADate;
 
-  tRecId = [NSNumber numberWithInt: (int) [recId timeIntervalSince1970]];
-  tADate = [NSNumber numberWithInt: (int) [alarmDate timeIntervalSince1970]];
+  // We check if recId and alarmDate are nil prior calling -timeIntervalSince1970
+  // Weird gcc optimizations can cause issue here.
+  tRecId = [NSNumber numberWithInt: (recId ? (int)[recId timeIntervalSince1970] : 0)];
+  tADate = [NSNumber numberWithInt: (alarmDate ? (int)[alarmDate timeIntervalSince1970] : 0)];
 
   return [NSDictionary dictionaryWithObjectsAndKeys: cname, @"c_name",
                        path, @"c_path",