diff -Nru zentyal-network-3.1.5/ChangeLog zentyal-network-3.1.6/ChangeLog
--- zentyal-network-3.1.5/ChangeLog	2013-09-17 09:15:46.000000000 +0000
+++ zentyal-network-3.1.6/ChangeLog	2013-09-18 12:43:39.000000000 +0000
@@ -1,3 +1,5 @@
+3.1.6
+	+ Guard against undefined rows getting auto value in GatewayTable
 3.1.5
 	+ Fix addition of gateways in initial configuration wizard
 	+ Override daemons when migrating from 3.0
diff -Nru zentyal-network-3.1.5/debian/changelog zentyal-network-3.1.6/debian/changelog
--- zentyal-network-3.1.5/debian/changelog	2013-09-17 09:15:46.000000000 +0000
+++ zentyal-network-3.1.6/debian/changelog	2013-09-18 12:43:39.000000000 +0000
@@ -1,3 +1,9 @@
+zentyal-network (3.1.6) precise; urgency=low
+
+  * New upstream release
+
+ -- José A. Calvo <jacalvo@zentyal.com>  Wed, 18 Sep 2013 14:43:39 +0200
+
 zentyal-network (3.1.5) precise; urgency=low
 
   * New upstream release
diff -Nru zentyal-network-3.1.5/src/EBox/Network/Model/GatewayTable.pm zentyal-network-3.1.6/src/EBox/Network/Model/GatewayTable.pm
--- zentyal-network-3.1.5/src/EBox/Network/Model/GatewayTable.pm	2013-09-17 09:15:46.000000000 +0000
+++ zentyal-network-3.1.6/src/EBox/Network/Model/GatewayTable.pm	2013-09-18 12:43:39.000000000 +0000
@@ -138,7 +138,7 @@
         my $id = $currentIfaces{$iface};
         my $row = $self->row($id);
 
-        next unless $row->valueByName('auto');
+        next unless (defined ($row) and $row->valueByName('auto'));
 
         $self->removeRow($id, 1);