diff --git a/workers/dockerfilebuild.py b/workers/dockerfilebuild.py
index 1a3625940..398b33842 100644
--- a/workers/dockerfilebuild.py
+++ b/workers/dockerfilebuild.py
@@ -115,7 +115,13 @@ class DockerfileBuildContext(object):
     current_step = 0
     built_image = None
     for status in unwrap_stream(build_status):
-      fully_unwrapped = status['message'] if 'message' in status else status
+      fully_unwrapped = ""
+      if isinstance(status, dict):
+        if len(status) > 0:
+          fully_unwrapped = status.values()[0]
+      elif isinstance(status, basestring):
+        fully_unwrapped = status
+
       status_str = str(fully_unwrapped.encode('utf-8'))
       logger.debug('Status: %s', status_str)
       step_increment = re.search(r'Step ([0-9]+) :', status_str)