lib/changelog.rb in create_changelog-1.3.0 vs lib/changelog.rb in create_changelog-1.3.1

@@ -91,10 +91,14 @@
 		# If previous_tag is the initial commit, make sure to include its message
 		commit_changelog.add_commit previous_tag if previous_tag == @@tags.list[-1]
 
 		# Combine changelog entries from tag annotation and commit messages
 		if tag.changelog
-			combined_changelog = tag.changelog.concat(commit_changelog.changelog)
+      if commit_changelog.changelog
+        combined_changelog = tag.changelog.concat(commit_changelog.changelog)
+      else
+        combined_changelog = tag.changelog
+      end
 		else
 			combined_changelog = commit_changelog.changelog
 		end
 		combined_changelog.uniq! if combined_changelog