diff --git a/network/manifests/init.pp b/network/manifests/init.pp
index 0ed1f6b..a955025 100644
--- a/network/manifests/init.pp
+++ b/network/manifests/init.pp
@@ -230,22 +230,21 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none",
 #   $device:
 #       Interface to use for this route.
 #
-define network::route($gateway = "NONE", $device, $ipv6gateway = "") {
+define network::route($gateway = "", $device, $ipv6gateway = "") {
 
     case $name {
 	"default": {
-            if "${gateway}" == "NONE" {
-                fail("Cannot set empty gateway for default route.")
-            }
 	    case $operatingsystem {
 		centos,fedora: {
 		    include network::helper::restart
-		    augeas { "set-default-route":
-			context => "/files/etc/sysconfig/network",
-			changes => [ "set GATEWAY ${gateway}",
-				     "set GATEWAYDEV ${device}", ],
-			notify  => Exec["restart-network"],
-		    }
+                    if "${gateway}" != "" {
+ 	                augeas { "set-default-route":
+			    context => "/files/etc/sysconfig/network",
+			    changes => [ "set GATEWAY ${gateway}",
+				         "set GATEWAYDEV ${device}", ],
+			    notify  => Exec["restart-network"],
+		        }
+                    }
                     if "${ipv6gateway}" != "" {
                         augeas { "set-default-ipv6-route":
                             context => "/files/etc/sysconfig/network",
@@ -284,6 +283,9 @@ define network::route($gateway = "NONE", $device, $ipv6gateway = "") {
 	    }
 	}
 	default: {
+            if ipv6gateway != "" {
+                fail("Custom IPv6 routes not supported yet.")
+            }
             case $operatingsystem {
                 "fedora","centos": {
                     include network::helper::restart
diff --git a/network/templates/route-if.erb b/network/templates/route-if.erb
index 93baca6..0563de4 100644
--- a/network/templates/route-if.erb
+++ b/network/templates/route-if.erb
@@ -1,3 +1,3 @@
 ADDRESS0=<%= name.split('/')[0] %>
 NETMASK0=<%= name.split('/')[1] %>
-<% if gateway != "NONE" %>GATEWAY0=<%= gateway %><% end %>
+<% if gateway != "" %>GATEWAY0=<%= gateway %><% end %>