--- a/bin/pvl.verkko-dhcp	Wed Oct 24 21:28:32 2012 +0300
+++ b/bin/pvl.verkko-dhcp	Wed Nov 21 22:13:59 2012 +0200
@@ -213,10 +213,11 @@
         ip = lease['lease']
         mac = lease.get('hwaddr')
         starts = lease['starts']
-        ends = lease['ends']
+        ends = lease.get('ends')
 
         update = db.dhcp_leases.update()
         
+        # XXX: if ends is None?
         if mac :
             # renew lease..?
             update = update.where((c.ip == ip) & (c.mac == mac) & ((starts < c.ends) | (c.ends == None)))
@@ -227,7 +228,7 @@
         update = update.values(
                 state       = lease['binding-state'],
                 next        = lease.get('next-binding-state'),
-                ends        = lease['ends'],
+                ends        = ends,
         )
 
         if lease.get('client-hostname') :
@@ -248,7 +249,7 @@
             hostname    = lease.get('client-hostname'),
 
             starts      = lease['starts'],
-            ends        = lease['ends'],
+            ends        = lease.get('ends'),
 
             state       = lease['binding-state'],
             next        = lease.get('next-binding-state'),