diff --git a/lib/farside.ex b/lib/farside.ex
index e680cdc..345d2c1 100644
--- a/lib/farside.ex
+++ b/lib/farside.ex
@@ -91,7 +91,7 @@ defmodule Farside do
     # Either pick a random available instance,
     # or fall back to the default one
     instance =
-      if Enum.count(instances) > 0 do
+      if instances != nil && Enum.count(instances) > 0 do
         if Enum.count(instances) == 1 do
           # If there's only one instance, just return that one...
           List.first(instances)
diff --git a/lib/farside/router.ex b/lib/farside/router.ex
index a11e07a..ce0eb0a 100644
--- a/lib/farside/router.ex
+++ b/lib/farside/router.ex
@@ -18,7 +18,7 @@ defmodule Farside.Router do
     end
   end
 
-  get "/" do
+  match "/" do
     resp =
       EEx.eval_file(
         @index,
@@ -29,7 +29,7 @@ defmodule Farside.Router do
     send_resp(conn, 200, resp)
   end
 
-  get "/_/:service/*glob" do
+  match "/_/:service/*glob" do
     r_path = String.slice(conn.request_path, 2..-1)
 
     resp =
@@ -41,7 +41,7 @@ defmodule Farside.Router do
     send_resp(conn, 200, resp)
   end
 
-  get "/:service/*glob" do
+  match "/:service/*glob" do
     service_name = cond do
       service =~ "http" ->
         List.first(glob)