2 files changed, 7 insertions, 1 deletions
diff --git a/lib/bb/fetch.py b/lib/bb/fetch.py
index 8567fbfd8..5e8d3ca12 100644
--- a/lib/bb/fetch.py
+++ b/lib/bb/fetch.py
@@ -74,6 +74,12 @@ def uri_replace(uri, uri_find, uri_replace, d):
 methods = []
 
 def init(urls = [], d = None):
+    if d == None:
+        bb.error("BUG init called with None as data object!!!")
+        import traceback
+        traceback.print_stack()
+        return
+
     for m in methods:
         m.urls = []
 
diff --git a/lib/bb/parse/BBHandler.py b/lib/bb/parse/BBHandler.py
index 8e7f9c0c5..bab8295cb 100644
--- a/lib/bb/parse/BBHandler.py
+++ b/lib/bb/parse/BBHandler.py
@@ -361,7 +361,7 @@ def set_additional_vars(file, d, include):
 
     from bb import fetch
     try:
-        fetch.init(src_uri.split())
+        fetch.init(src_uri.split(), d)
     except fetch.NoMethodError:
         pass
     except bb.MalformedUrl,e: