diff --git a/sitemap_generator.rb b/sitemap_generator.rb
index 6ac07c0..68dc034 100644
--- a/sitemap_generator.rb
+++ b/sitemap_generator.rb
@@ -197,7 +197,8 @@ def fill_url(site, page_or_post)
     # Returns the location of the page or post
     def fill_location(site, page_or_post)
       loc = REXML::Element.new "loc"
-      url = site.config['url'] + site.config['baseurl']
+      baseurl = site.config['baseurl']
+      url = baseurl.nil? ? site.config['url'] : site.config['url'] + baseurl
       loc.text = page_or_post.location_on_server(url)
 
       loc