diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index 8dd76925..7b3e8a81 100755
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -88,7 +88,15 @@ namespace SparkleLib {
         public bool IsBuffering { get; private set; }
         public double ProgressPercentage { get; private set; }
         public double ProgressSpeed { get; private set; }
-        public DateTime LastSync { get { return ChangeSets [0].Timestamp; }}
+
+        public DateTime LastSync {
+            get {
+                if (ChangeSets != null && ChangeSets.Count > 0)
+                    return ChangeSets [0].Timestamp;
+                else
+                    return DateTime.MinValue;
+            }
+        }
 
         public virtual string Identifier {
             get {
diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
index c28b76fc..486104f9 100755
--- a/SparkleShare/SparkleStatusIconController.cs
+++ b/SparkleShare/SparkleStatusIconController.cs
@@ -46,7 +46,10 @@ namespace SparkleShare {
 
         public string StatusMessage {
             get {
-                string status_message = string.Format ("Synced {0}", this.repo.LastSync.ToPrettyDate ());
+                string status_message = "Waiting to sync";
+                
+                if (!this.repo.LastSync.Equals (DateTime.MinValue))
+                    status_message = string.Format ("Synced {0}", this.repo.LastSync.ToPrettyDate ());
 
                 if (this.repo.Status == SyncStatus.SyncUp)
                     status_message = "Sending changes… " + this.repo.ProgressPercentage + "%";
diff --git a/legal/Authors.txt b/legal/Authors.txt
index 92b02843..201477f8 100755
--- a/legal/Authors.txt
+++ b/legal/Authors.txt
@@ -1,16 +1,8 @@
-Points of contact:
+Maintainer:
 
-	Maintainer:
 	Hylke Bons <hylkebons@gmail.com>
 
-	Marketing:
-	Alexandre Saiz Verdaguer <alex@sparkleshare.net>
-
-	Translations:
-	Łukasz Jernaś <deejay1@srem.org>
-
-
-Code:
+Contributors:
 
 	Alejandro Serrano <trupill@gmail.com>
 	Alexandre Saiz Verdaguer <a@alexandresaiz.com>
@@ -40,14 +32,13 @@ Code:
 	Travis Glenn Hansen <travisghansen@yahoo.com>
 	Vincent Untz <vuntz@gnome.org>
 	Will Thompson <will@willthompson.co.uk>
-	
-	
-Artwork:
+		
+Designers:
 
 	Andreas Nilsson <andreasn@gnome.org>
 	Jakub Steiner <jimmac@redhat.com>
 	Hylke Bons <hylkebons@gmail.com>
 	Lapo Calamandrei <calamandrei@gmail.com>
 
-
 Thanks very much!
+