diff --git a/changes.py b/changes.py
index c0f2a73..d70d33a 100644
--- a/changes.py
+++ b/changes.py
@@ -179,7 +179,7 @@ def output_text(hard):
 	else:
 		print("No commited files with the specified extensions were found.")
 
-def output_xml(string, hard):
+def output_xml(hard):
 	authorinfo_list = get(hard).get_authorinfo_list()
 	total_changes = 0.0
 
@@ -204,6 +204,7 @@ def output_xml(string, hard):
 			changes_xml += ("\t\t\t<author>\n" + name_xml + commits_xml + insertions_xml +
 			                deletions_xml + percentage_xml + "\t\t\t</author>\n")
 
-		print(string.format("\n\t<changes>\n" + message_xml + "\t\t<authors>\n" + changes_xml + "\t\t</authors>\n\t</changes>\n"))
+		print("\t<changes>\n" + message_xml + "\t\t<authors>\n" + changes_xml + "\t\t</authors>\n\t</changes>")
 	else:
-		print(string.format("<changes>" + "No commited files with the specified extensions were found." + "</changes>"))
+		print("\t<changes>\n\t\t<exception>" + "No commited files with the specified extensions were found." +
+		      "</exception>\n\t</changes>")
diff --git a/format.py b/format.py
index 9b46e51..d48fa6d 100644
--- a/format.py
+++ b/format.py
@@ -39,8 +39,8 @@ def call_output_function(html_function, text_function, xml_function, *parameters
 		template_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "html.template")
 		file_r = open(template_path, "rb")
 		template = file_r.read().decode("utf-8", "replace")
-		html_function(template, parameters)
+		html_function(template, *parameters)
 	elif __selected_format__ == "text":
-		text_function(parameters)
+		text_function(*parameters)
 	else:
-		xml_function("<gitinspector>{0}</gitinspector>", parameters)
+		xml_function(*parameters)
diff --git a/version.py b/version.py
index ae1b466..effad2c 100644
--- a/version.py
+++ b/version.py
@@ -34,7 +34,7 @@ def output_html(string, _):
 def output_text(_):
 	print("gitinspector {0}\n".format(__version__) + __doc__)
 
-def output_xml(string, _):
+def output_xml(_):
 	license_text = "\t\t" + __doc__.replace("\n", "\n\t\t")
 	print(string.format("\n\t<version>" + __version__ + "</version>\n" +
 	                    "\t<license-text>\n" + license_text + "\n\t</license-text>\n"))