diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb
index b183c15..18cbc94 100644
--- a/app/models/repository/mercurial.rb
+++ b/app/models/repository/mercurial.rb
@@ -58,7 +58,9 @@ class Repository::Mercurial < Repository
       # latest revision found in database
       db_revision = latest_changeset ? latest_changeset.revision.to_i : -1
       # latest revision in the repository
-      scm_revision = scm_info.lastrev.identifier.to_i
+      latest_revision = scm_info.lastrev
+      return if latest_revision.nil?
+      scm_revision = latest_revision.identifier.to_i
       if db_revision < scm_revision
         logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
         identifier_from = db_revision + 1
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index b92c886..72db723 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -105,7 +105,8 @@ module Redmine
                 line_feeds += 1 if line.chomp.empty?
               end
             end
-            revisions << build_revision_from_changeset(changeset)
+            # Add the last changeset if there is one left
+            revisions << build_revision_from_changeset(changeset) if changeset[:date]
           end
           return nil if $? && $?.exitstatus != 0
           revisions