diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 4e9b582c..c2b67245 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -493,7 +493,8 @@ namespace SparkleLib {
 
                     if ((change_set.Added.Count +
                          change_set.Edited.Count +
-                         change_set.Deleted.Count) > 0) {
+                         change_set.Deleted.Count +
+                         change_set.MovedFrom.Count) > 0) {
 
                         change_set.Notes.AddRange (GetNotes (change_set.Revision));
                         change_sets.Add (change_set);
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index 70cb9808..6d724859 100644
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -444,22 +444,25 @@ namespace SparkleLib {
                 if (SyncStatusChanged != null)
                     SyncStatusChanged (SyncStatus.Idle);
 
-                SparkleChangeSet change_set = GetChangeSets (1) [0];
+                List<SparkleChangeSet> change_sets = GetChangeSets (1);
+                if (change_sets != null && change_sets.Count > 0) {
+                    SparkleChangeSet change_set = change_sets [0];
 
-                bool note_added = false;
-                foreach (string added in change_set.Added) {
-                    if (added.Contains (".notes")) {
-                        if (NewNote != null)
-                            NewNote (change_set.User.Name, change_set.User.Email);
+                    bool note_added = false;
+                    foreach (string added in change_set.Added) {
+                        if (added.Contains (".notes")) {
+                            if (NewNote != null)
+                                NewNote (change_set.User.Name, change_set.User.Email);
 
-                        note_added = true;
-                        break;
+                            note_added = true;
+                            break;
+                        }
                     }
-                }
 
-                if (!note_added) {
-                    if (NewChangeSet != null)
-                        NewChangeSet (change_set);
+                    if (!note_added) {
+                        if (NewChangeSet != null)
+                            NewChangeSet (change_set);
+                    }
                 }
 
                 // There could be changes from a resolved