diff --git a/layerindex/views.py b/layerindex/views.py
index f945044..71524b3 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -232,6 +232,10 @@ def bulk_change_patch_view(request, pk):
                 return response
         return HttpResponse('No patch data generated', content_type='text/plain')
     except Exception as e:
+        output = getattr(e, 'output', None)
+        if output:
+            if 'timeout' in output:
+                return HttpResponse('Failed to generate patches: timed out waiting for lock. Please try again shortly.', content_type='text/plain')
         return HttpResponse('Failed to generate patches: %s' % e, content_type='text/plain')
     # FIXME better error handling