diff --git a/src/XmlSitemapGenerator.php b/src/XmlSitemapGenerator.php
index 29087e7..00b51e4 100644
--- a/src/XmlSitemapGenerator.php
+++ b/src/XmlSitemapGenerator.php
@@ -322,8 +322,16 @@ class XmlSitemapGenerator implements XmlSitemapGeneratorInterface {
     else {
       // Cleanup the 'extra' empty file.
       $file = xmlsitemap_sitemap_get_file($sitemap, $sitemap->getChunks());
-      if (file_exists($file) && $sitemap->getChunks() > 1) {
-        file_unmanaged_delete($file);
+      if ($sitemap->getChunks() > 1) {
+        if (file_exists($file)) {
+          file_unmanaged_delete($file);
+        }
+        if (xmlsitemap_var('gz')) {
+          $file_gz = $file . '.gz';
+          if (file_exists($file_gz)) {
+            file_unmanaged_delete($file_gz);
+          }
+        }
       }
       $sitemap->setChunks($sitemap->getChunks() - 1);
 
diff --git a/src/XmlSitemapWriter.php b/src/XmlSitemapWriter.php
index 551ee29..b460dc5 100644
--- a/src/XmlSitemapWriter.php
+++ b/src/XmlSitemapWriter.php
@@ -242,8 +242,10 @@ class XmlSitemapWriter extends \XMLWriter {
   public function endDocument() {
     $return = parent::endDocument();
 
+    $file = $this->uri;
+    
     if (!$return) {
-      throw new XmlSitemapGenerationException(t('Unknown error occurred while writing to file @file.', array('@file' => $this->uri)));
+      throw new XmlSitemapGenerationException(t('Unknown error occurred while writing to file @file.', array('@file' => $file)));
     }
 
     if (xmlsitemap_var('gz')) {