diff --git a/intranet/modules/mesMachines/main.py b/intranet/modules/mesMachines/main.py
index 765c9bd9..a18a58c4 100644
--- a/intranet/modules/mesMachines/main.py
+++ b/intranet/modules/mesMachines/main.py
@@ -70,6 +70,8 @@ class main(ModuleBase):
             machineInfos['mac'] = machine.mac()
             machineInfos['mid'] = machine.id()
             machineInfos['ip'] = machine.ip()
+            machineInfos['ipv6'] = str(machine.ipv6())
+            machineInfos['dnsIpv6'] = str(machine.dnsIpv6())
             # type
             if machine.objectClass == 'machineFixe':
                 machineInfos['type'] = 'fixe'
@@ -245,7 +247,10 @@ class main(ModuleBase):
             message = m.save()
             del m
         except ValueError, e:
-            del m
+            try:
+                del m
+            except:
+                pass
             return {'error':e.args[0].replace("\n","\\n")}
         crans.cp.log("Nouvelle machine %s" % nomNouvelleMachine, "MACHINES")
         return {'message':u"Machine enregistrée avec succès"}
diff --git a/intranet/modules/mesMachines/static/machines.js b/intranet/modules/mesMachines/static/machines.js
index c8c722b0..2d5bee77 100644
--- a/intranet/modules/mesMachines/static/machines.js
+++ b/intranet/modules/mesMachines/static/machines.js
@@ -125,6 +125,8 @@ Machines.infoPane.display = function(result)
       appendChildNodes(basicInfos, createDOM("DT", "type:" ), createDOM("DD",{},"Machine " + result.type ) );
       appendChildNodes(basicInfos, createDOM("DT", "mac: " ), createDOM("DD",{},result.mac ) );
       appendChildNodes(basicInfos, createDOM("DT", "ip: " ), createDOM("DD",{},result.ip ) );
+      appendChildNodes(basicInfos, createDOM("DT", "ipv6: " ), createDOM("DD",{},result.ipv6 ) );
+      appendChildNodes(basicInfos, createDOM("DT", "accessible directement en ipv6: " ), createDOM("DD",{},result.dnsIpv6 ) );
       if (result.ipsec)
 	appendChildNodes(basicInfos, createDOM("DT", "Clef Wifi:" ), createDOM("DD",{},result.ipsec ) ); 
       appendChildNodes( machinePane, basicInfos );