If delivery_info isnt set we cant use it

celery/task/base.py

@@ -542,8 +542,9 @@ class BaseTask(object):
             kwargs = request.kwargs
 
         delivery_info = request.delivery_info
-        options.setdefault("exchange", delivery_info.get("exchange"))
-        options.setdefault("routing_key", delivery_info.get("routing_key"))
+        if delivery_info:
+            options.setdefault("exchange", delivery_info.get("exchange"))
+            options.setdefault("routing_key", delivery_info.get("routing_key"))
 
         options["retries"] = request.retries + 1
         options["task_id"] = kwargs.pop("task_id", None)