diff --git a/network/manifests/init.pp b/network/manifests/init.pp
index 39e3598..a955025 100644
--- a/network/manifests/init.pp
+++ b/network/manifests/init.pp
@@ -230,7 +230,7 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none",
 #   $device:
 #       Interface to use for this route.
 #
-define network::route($gateway, $device, $ipv6gateway = "") {
+define network::route($gateway = "", $device, $ipv6gateway = "") {
 
     case $name {
 	"default": {
@@ -283,6 +283,9 @@ define network::route($gateway, $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 %>