Index: trunk/dhcp/dhcpserver.py
===================================================================
--- trunk/dhcp/dhcpserver.py	(revision 229)
+++ trunk/dhcp/dhcpserver.py	(revision 230)
@@ -105,10 +105,10 @@
         chaddr = hwmac(packet.GetHardwareAddress())
         nic = self.findNIC(str(chaddr))
-        if nic is None:
+        if nic is None or nic.machine is None:
             return False
         ip = nic.ip
         if ip is None:  #Deactivated?
             return False
-        hostname = nic.hostname
+        hostname = nic.machine.name
         if hostname is not None:
             hostname += ".servers.csail.mit.edu"