diff --git a/scrapy/trunk/scrapy/core/downloader/handlers.py b/scrapy/trunk/scrapy/core/downloader/handlers.py
index 8da8852ff..bbcd69aa4 100644
--- a/scrapy/trunk/scrapy/core/downloader/handlers.py
+++ b/scrapy/trunk/scrapy/core/downloader/handlers.py
@@ -6,11 +6,12 @@ from __future__ import with_statement
 import os
 import urlparse
 
+from twisted.web.client import HTTPClientFactory
 from twisted.internet import defer, reactor
 from twisted.web import error as web_error
 
 from scrapy.core import signals
-from scrapy.http import Request, Response, Headers, HTTPClientFactory
+from scrapy.http import Request, Response, Headers
 from scrapy.core.exceptions import UsageError, HttpException
 from scrapy.utils.misc import defer_succeed
 from scrapy.conf import settings
diff --git a/scrapy/trunk/scrapy/core/downloader/manager.py b/scrapy/trunk/scrapy/core/downloader/manager.py
index 6b0426299..3855fbbfc 100644
--- a/scrapy/trunk/scrapy/core/downloader/manager.py
+++ b/scrapy/trunk/scrapy/core/downloader/manager.py
@@ -140,7 +140,7 @@ class Downloader(object):
             return
 
         # Instanciate site specific handling based on info provided by spider
-        delay = settings.getint('DOWNLOAD_DELAY', None) or getattr(spider, 'download_delay', None)
+        delay = settings.getint('DOWNLOAD_DELAY') or getattr(spider, 'download_delay', None)
         maxcr = getattr(spider, 'max_concurrent_requests', settings.getint('REQUESTS_PER_DOMAIN'))
         site = SiteDetails(download_delay=delay, max_concurrent_requests=maxcr)
         self.sites[domain] = site