diff --git a/layerindex/update.py b/layerindex/update.py
index 89f41f9..7067044 100755
--- a/layerindex/update.py
+++ b/layerindex/update.py
@@ -518,6 +518,10 @@ def main():
                     transaction.rollback()
                 else:
                     transaction.commit()
+            except KeyboardInterrupt:
+                transaction.rollback()
+                logger.warn("Update interrupted, changes to %s rolled back" % layer.name)
+                break
             except:
                 import traceback
                 traceback.print_exc()