diff --git a/buildman/jobutil/workererror.py b/buildman/jobutil/workererror.py
index 44b96fb0a..9245f312e 100644
--- a/buildman/jobutil/workererror.py
+++ b/buildman/jobutil/workererror.py
@@ -5,88 +5,91 @@ class WorkerError(object):
     self._base_message = base_message
 
     self._error_handlers = {
-        'io.quay.builder.buildpackissue': {
-            'message': 'Could not load build package',
-            'is_internal': True,
-        },
+      'io.quay.builder.buildpackissue': {
+        'message': 'Could not load build package',
+        'is_internal': True,
+      },
 
-        'io.quay.builder.gitfailure': {
-            'message': 'Could not clone git repository',
-            'show_base_error': True,
-        },
+      'io.quay.builder.gitfailure': {
+        'message': 'Could not clone git repository',
+        'show_base_error': True,
+      },
 
-        'io.quay.builder.gitcheckout': {
-            'message': 'Could not checkout git ref. Have you force pushed recently?',
-        },
+      'io.quay.builder.gitcheckout': {
+        'message': 'Could not checkout git ref. If you force pushed recently, ' +
+                   'the commit may be missing.',
+        'show_base_error': True,
+      },
 
-        'io.quay.builder.cannotextractbuildpack': {
-            'message': 'Could not extract the contents of the build package'
-        },
+      'io.quay.builder.cannotextractbuildpack': {
+        'message': 'Could not extract the contents of the build package'
+      },
 
-        'io.quay.builder.cannotpullforcache': {
-            'message': 'Could not pull cached image',
-            'is_internal': True
-        },
+      'io.quay.builder.cannotpullforcache': {
+        'message': 'Could not pull cached image',
+        'is_internal': True
+      },
 
-        'io.quay.builder.dockerfileissue': {
-            'message': 'Could not find or parse Dockerfile',
-            'show_base_error': True
-        },
+      'io.quay.builder.dockerfileissue': {
+        'message': 'Could not find or parse Dockerfile',
+        'show_base_error': True
+      },
 
-        'io.quay.builder.cannotpullbaseimage': {
-            'message': 'Could not pull base image',
-            'show_base_error': True
-        },
+      'io.quay.builder.cannotpullbaseimage': {
+        'message': 'Could not pull base image',
+        'show_base_error': True
+      },
 
-        'io.quay.builder.internalerror': {
-            'message': 'An internal error occurred while building. Please submit a ticket.',
-            'is_internal': True
-        },
+      'io.quay.builder.internalerror': {
+        'message': 'An internal error occurred while building. Please submit a ticket.',
+        'is_internal': True
+      },
 
-        'io.quay.builder.buildrunerror': {
-            'message': 'Could not start the build process',
-            'is_internal': True
-        },
+      'io.quay.builder.buildrunerror': {
+        'message': 'Could not start the build process',
+        'is_internal': True
+      },
 
-        'io.quay.builder.builderror': {
-            'message': 'A build step failed',
-            'show_base_error': True
-        },
+      'io.quay.builder.builderror': {
+        'message': 'A build step failed',
+        'show_base_error': True
+      },
 
-        'io.quay.builder.tagissue': {
-            'message': 'Could not tag built image',
-            'is_internal': True
-        },
+      'io.quay.builder.tagissue': {
+        'message': 'Could not tag built image',
+        'is_internal': True
+      },
 
-        'io.quay.builder.pushissue': {
-            'message': 'Could not push built image',
-            'show_base_error': True,
-            'is_internal': True
-        },
+      'io.quay.builder.pushissue': {
+        'message': 'Could not push built image',
+        'show_base_error': True,
+        'is_internal': True
+      },
 
-        'io.quay.builder.dockerconnecterror': {
-            'message': 'Could not connect to Docker daemon',
-            'is_internal': True
-        },
+      'io.quay.builder.dockerconnecterror': {
+        'message': 'Could not connect to Docker daemon',
+        'is_internal': True
+      },
 
-        'io.quay.builder.missingorinvalidargument': {
-            'message': 'Missing required arguments for builder',
-            'is_internal': True
-        },
+      'io.quay.builder.missingorinvalidargument': {
+        'message': 'Missing required arguments for builder',
+        'is_internal': True
+      },
 
-        'io.quay.builder.cachelookupissue': {
-            'message': 'Error checking for a cached tag',
-            'is_internal': True
-        },
+      'io.quay.builder.cachelookupissue': {
+        'message': 'Error checking for a cached tag',
+        'is_internal': True
+      },
 
-        'io.quay.builder.errorduringphasetransition': {
-          'message': 'Error during phase transition. If this problem persists please contact customer support.',
-          'is_internal': True
-        },
+      'io.quay.builder.errorduringphasetransition': {
+        'message': 'Error during phase transition. If this problem persists ' +
+                   'please contact customer support.',
+        'is_internal': True
+      },
 
-        'io.quay.builder.clientrejectedtransition': {
-          'message': 'Build can not be finished due to user cancellation.',
-        }
+      'io.quay.builder.clientrejectedtransition': {
+        'message': 'Build can not be finished due to user cancellation.',
+      }
     }
 
   def is_internal_error(self):
@@ -107,10 +110,10 @@ class WorkerError(object):
   def extra_data(self):
     if self._base_message:
       return {
-          'base_error': self._base_message,
-          'error_code': self._error_code
+        'base_error': self._base_message,
+        'error_code': self._error_code
       }
 
     return {
-        'error_code': self._error_code
+      'error_code': self._error_code
     }