diff --git a/lib/galaxy/tool_util/deps/containers.py b/lib/galaxy/tool_util/deps/containers.py
index d99a2e1c0aa..55a994ec78c 100644
--- a/lib/galaxy/tool_util/deps/containers.py
+++ b/lib/galaxy/tool_util/deps/containers.py
@@ -148,7 +148,7 @@ class ContainerFinder(object):
             key = "%s_image" % container_type
         if key in destination_info:
             return destination_info.get(key)
-        elif "%s_image_default" in destination_info:
+        elif "%s_image_default" % container_type in destination_info:
             return self.__build_container_id_from_parts(container_type, destination_info, mode="default")
         return None
 
@@ -159,7 +159,7 @@ class ContainerFinder(object):
 
         # TODO: Right now this assumes all containers available when a
         # container type is - there should be more thought put into this.
-        # Checking which are availalbe - settings policies for what can be
+        # Checking which are available - settings policies for what can be
         # auto-fetched, etc....
         return CONTAINER_CLASSES[container_type](container_id, self.app_info, tool_info, destination_info, job_info, container_description)