diff --git a/lib/puppet/network/http/api/v3/indirected_routes.rb b/lib/puppet/network/http/api/v3/indirected_routes.rb
index ed96edb1f..41d432287 100644
--- a/lib/puppet/network/http/api/v3/indirected_routes.rb
+++ b/lib/puppet/network/http/api/v3/indirected_routes.rb
@@ -1,234 +1,236 @@
 require 'puppet/network/authorization'
 
 class Puppet::Network::HTTP::API::V3::IndirectedRoutes
   include Puppet::Network::Authorization
 
   # How we map http methods and the indirection name in the URI
   # to an indirection method.
   METHOD_MAP = {
     "GET" => {
       :plural => :search,
       :singular => :find
     },
     "POST" => {
       :singular => :find,
     },
     "PUT" => {
       :singular => :save
     },
     "DELETE" => {
       :singular => :destroy
     },
     "HEAD" => {
       :singular => :head
     }
   }
 
   def self.routes
     Puppet::Network::HTTP::Route.path(/.*/).any(new)
   end
 
   # handle an HTTP request
   def call(request, response)
-    indirection_name, method, key, params = uri2indirection(request.method, request.path, request.params)
+    indirection, method, key, params = uri2indirection(request.method, request.path, request.params)
     certificate = request.client_cert
 
-    check_authorization(method, "/v3/#{indirection_name}/#{key}", params)
-
-    indirection = Puppet::Indirector::Indirection.instance(indirection_name.to_sym)
-    if !indirection
-      raise ArgumentError, "Could not find indirection '#{indirection_name}'"
-    end
-
     if !indirection.allow_remote_requests?
       # TODO: should we tell the user we found an indirection but it doesn't
       # allow remote requests, or just pretend there's no handler at all? what
       # are the security implications for the former?
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("No handler for #{indirection.name}", :NO_INDIRECTION_REMOTE_REQUESTS)
     end
 
     trusted = Puppet::Context::TrustedInformation.remote(params[:authenticated], params[:node], certificate)
     Puppet.override(:trusted_information => trusted) do
       send("do_#{method}", indirection, key, params, request, response)
     end
   rescue Puppet::Network::HTTP::Error::HTTPError => e
     return do_http_control_exception(response, e)
   rescue StandardError => e
     return do_exception(response, e)
   end
 
   def uri2indirection(http_method, uri, params)
     # the first field is always nil because of the leading slash,
     # and we also want to strip off the leading /v3.
-    indirection, key = uri.split("/", 4)[2..-1]
+    indirection_name, key = uri.split("/", 4)[2..-1]
     environment = params.delete(:environment)
 
-    if ! Puppet::Node::Environment.valid_name?(environment)
-      raise ArgumentError, "The environment must be purely alphanumeric, not '#{environment}'"
+    if indirection_name !~ /^\w+$/
+      raise ArgumentError, "The indirection name must be purely alphanumeric, not '#{indirection_name}'"
     end
 
-    if indirection !~ /^\w+$/
-      raise ArgumentError, "The indirection name must be purely alphanumeric, not '#{indirection}'"
+    method = indirection_method(http_method, indirection_name)
+    check_authorization(method, "/v3/#{indirection_name}/#{key}", params)
+
+    indirection = Puppet::Indirector::Indirection.instance(indirection_name.to_sym)
+    if !indirection
+      raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new(
+        "Could not find indirection '#{indirection_name}'", Puppet::Network::HTTP::Issues::HANDLER_NOT_FOUND)
     end
 
-    method = indirection_method(http_method, indirection)
+    if !environment
+      raise ArgumentError, "An environment parameter must be specified"
+    end
+
+    if ! Puppet::Node::Environment.valid_name?(environment)
+      raise ArgumentError, "The environment must be purely alphanumeric, not '#{environment}'"
+    end
 
     configured_environment = Puppet.lookup(:environments).get(environment)
     if configured_environment.nil?
-      raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new(
-                "Could not find environment '#{environment}'",
-                Puppet::Network::HTTP::Issues::ENVIRONMENT_NOT_FOUND)
+      raise ArgumentError, "Could not find environment '#{environment}'"
     else
       configured_environment = configured_environment.override_from_commandline(Puppet.settings)
       params[:environment] = configured_environment
     end
 
     params.delete(:bucket_path)
 
     if key == "" or key.nil?
       raise ArgumentError, "No request key specified in #{uri}"
     end
 
     key = URI.unescape(key)
 
     [indirection, method, key, params]
   end
 
   private
 
   def do_http_control_exception(response, exception)
     msg = exception.message
     Puppet.info(msg)
     response.respond_with(exception.status, "text/plain", msg)
   end
 
   def do_exception(response, exception, status=400)
     if exception.is_a?(Puppet::Network::AuthorizationError)
       # make sure we return the correct status code
       # for authorization issues
       status = 403 if status == 400
     end
 
     Puppet.log_exception(exception)
 
     response.respond_with(status, "text/plain", exception.to_s)
   end
 
   # Execute our find.
   def do_find(indirection, key, params, request, response)
     unless result = indirection.find(key, params)
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Could not find #{indirection.name} #{key}", Puppet::Network::HTTP::Issues::RESOURCE_NOT_FOUND)
     end
 
     format = accepted_response_formatter_for(indirection.model, request)
 
     rendered_result = result
     if result.respond_to?(:render)
       Puppet::Util::Profiler.profile("Rendered result in #{format}", [:http, :v3_render, format]) do
         rendered_result = result.render(format)
       end
     end
 
     Puppet::Util::Profiler.profile("Sent response", [:http, :v3_response]) do
       response.respond_with(200, format, rendered_result)
     end
   end
 
   # Execute our head.
   def do_head(indirection, key, params, request, response)
     unless indirection.head(key, params)
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Could not find #{indirection.name} #{key}", Puppet::Network::HTTP::Issues::RESOURCE_NOT_FOUND)
     end
 
     # No need to set a response because no response is expected from a
     # HEAD request.  All we need to do is not die.
   end
 
   # Execute our search.
   def do_search(indirection, key, params, request, response)
     result = indirection.search(key, params)
 
     if result.nil?
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Could not find instances in #{indirection.name} with '#{key}'", Puppet::Network::HTTP::Issues::RESOURCE_NOT_FOUND)
     end
 
     format = accepted_response_formatter_for(indirection.model, request)
 
     response.respond_with(200, format, indirection.model.render_multiple(format, result))
   end
 
   # Execute our destroy.
   def do_destroy(indirection, key, params, request, response)
     formatter = accepted_response_formatter_or_pson_for(indirection.model, request)
 
     result = indirection.destroy(key, params)
 
     response.respond_with(200, formatter, formatter.render(result))
   end
 
   # Execute our save.
   def do_save(indirection, key, params, request, response)
     formatter = accepted_response_formatter_or_pson_for(indirection.model, request)
     sent_object = read_body_into_model(indirection.model, request)
 
     result = indirection.save(sent_object, key)
 
     response.respond_with(200, formatter, formatter.render(result))
   end
 
   def accepted_response_formatter_for(model_class, request)
     accepted_formats = request.headers['accept'] or raise Puppet::Network::HTTP::Error::HTTPNotAcceptableError.new("Missing required Accept header", Puppet::Network::HTTP::Issues::MISSING_HEADER_FIELD)
     request.response_formatter_for(model_class.supported_formats, accepted_formats)
   end
 
   def accepted_response_formatter_or_pson_for(model_class, request)
     accepted_formats = request.headers['accept'] || "text/pson"
     request.response_formatter_for(model_class.supported_formats, accepted_formats)
   end
 
   def read_body_into_model(model_class, request)
     data = request.body.to_s
 
     format = request.format
     model_class.convert_from(format, data)
   end
 
   def indirection_method(http_method, indirection)
     raise ArgumentError, "No support for http method #{http_method}" unless METHOD_MAP[http_method]
 
     unless method = METHOD_MAP[http_method][plurality(indirection)]
       raise ArgumentError, "No support for plurality #{plurality(indirection)} for #{http_method} operations"
     end
 
     method
   end
 
   def self.request_to_uri(request)
     uri, body = request_to_uri_and_body(request)
     "#{uri}?#{body}"
   end
 
   def self.request_to_uri_and_body(request)
     indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
     ["/v3/#{indirection}/#{request.escaped_key}", "environment=#{request.environment.name}&#{request.query_string}"]
   end
 
   def self.pluralize(indirection)
     return(indirection == "status" ? "statuses" : indirection + "s")
   end
 
   def plurality(indirection)
     # NOTE These specific hooks for paths are ridiculous, but it's a *many*-line
     # fix to not need this, and our goal is to move away from the complication
     # that leads to the fix being too long.
     return :singular if indirection == "status"
     return :singular if indirection == "certificate_status"
 
     result = (indirection =~ /s$|_search$/) ? :plural : :singular
 
     indirection.sub!(/s$|_search$/, '')
     indirection.sub!(/statuse$/, 'status')
 
     result
   end
 end
diff --git a/spec/unit/network/http/api/v3/indirected_routes_spec.rb b/spec/unit/network/http/api/v3/indirected_routes_spec.rb
index c5e938415..a97d190d2 100644
--- a/spec/unit/network/http/api/v3/indirected_routes_spec.rb
+++ b/spec/unit/network/http/api/v3/indirected_routes_spec.rb
@@ -1,485 +1,490 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/network/http'
 require 'puppet/network/http/api/v3/indirected_routes'
 require 'puppet/indirector_testing'
 
 describe Puppet::Network::HTTP::API::V3::IndirectedRoutes do
   let(:not_found_code) { Puppet::Network::HTTP::Error::HTTPNotFoundError::CODE }
   let(:not_acceptable_code) { Puppet::Network::HTTP::Error::HTTPNotAcceptableError::CODE }
+  let(:bad_request_code) { Puppet::Network::HTTP::Error::HTTPBadRequestError::CODE }
   let(:not_authorized_code) { Puppet::Network::HTTP::Error::HTTPNotAuthorizedError::CODE }
 
   let(:indirection) { Puppet::IndirectorTesting.indirection }
   let(:handler) { Puppet::Network::HTTP::API::V3::IndirectedRoutes.new }
   let(:response) { Puppet::Network::HTTP::MemoryResponse.new }
   let(:params) { { :environment => "production" } }
 
   def a_request_that_heads(data, request = {})
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
         'content-type' => "text/pson", },
       :method => "HEAD",
       :path => "/v3/#{indirection.name}/#{data.value}",
       :params => params,
     })
   end
 
   def a_request_that_submits(data, request = {})
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
         'content-type' => request[:content_type_header] || "text/pson", },
       :method => "PUT",
       :path => "/v3/#{indirection.name}/#{data.value}",
       :params => params,
       :body => request[:body].nil? ? data.render("pson") : request[:body]
     })
   end
 
   def a_request_that_destroys(data, request = {})
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
         'content-type' => "text/pson", },
       :method => "DELETE",
       :path => "/v3/#{indirection.name}/#{data.value}",
       :params => params,
       :body => ''
     })
   end
 
   def a_request_that_finds(data, request = {})
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
         'content-type' => "text/pson", },
       :method => "GET",
       :path => "/v3/#{indirection.name}/#{data.value}",
       :params => params,
       :body => ''
     })
   end
 
   def a_request_that_searches(key, request = {})
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
         'content-type' => "text/pson", },
       :method => "GET",
       :path => "/v3/#{indirection.name}s/#{key}",
       :params => params,
       :body => ''
     })
   end
 
   before do
     Puppet::IndirectorTesting.indirection.terminus_class = :memory
     Puppet::IndirectorTesting.indirection.terminus.clear
     handler.stubs(:check_authorization)
     handler.stubs(:warn_if_near_expiration)
   end
 
   describe "when converting a URI into a request" do
     let(:environment) { Puppet::Node::Environment.create(:env, []) }
     let(:env_loaders) { Puppet::Environments::Static.new(environment) }
     let(:params) { { :environment => "env" } }
 
     before do
       handler.stubs(:handler).returns "foo"
     end
 
     around do |example|
       Puppet.override(:environments => env_loaders) do
         example.run
       end
     end
 
     it "should get the environment from a query parameter" do
-      handler.uri2indirection("GET", "/v3/foo/bar", params)[3][:environment].to_s.should == "env"
+      handler.uri2indirection("GET", "/v3/node/bar", params)[3][:environment].to_s.should == "env"
+    end
+
+    it "should fail if there is no environment specified" do
+      lambda { handler.uri2indirection("GET", "/v3/node/bar", {}) }.should raise_error(ArgumentError)
     end
 
     it "should fail if the environment is not alphanumeric" do
-      lambda { handler.uri2indirection("GET", "/v3/foo/bar", {:environment => "env ness"}) }.should raise_error(ArgumentError)
+      lambda { handler.uri2indirection("GET", "/v3/node/bar", {:environment => "env ness"}) }.should raise_error(ArgumentError)
     end
 
     it "should not pass a buck_path parameter through (See Bugs #13553, #13518, #13511)" do
-      handler.uri2indirection("GET", "/v3/foo/bar", { :environment => "env",
-                                                      :bucket_path => "/malicious/path" })[3].should_not include({ :bucket_path => "/malicious/path" })
+      handler.uri2indirection("GET", "/v3/node/bar", { :environment => "env",
+                                                       :bucket_path => "/malicious/path" })[3].should_not include({ :bucket_path => "/malicious/path" })
     end
 
     it "should pass allowed parameters through" do
-      handler.uri2indirection("GET", "/v3/foo/bar", { :environment => "env",
-                                                      :allowed_param => "value" })[3].should include({ :allowed_param => "value" })
+      handler.uri2indirection("GET", "/v3/node/bar", { :environment => "env",
+                                                       :allowed_param => "value" })[3].should include({ :allowed_param => "value" })
     end
 
     it "should return the environment as a Puppet::Node::Environment" do
-      handler.uri2indirection("GET", "/v3/foo/bar", params)[3][:environment].should be_a(Puppet::Node::Environment)
+      handler.uri2indirection("GET", "/v3/node/bar", params)[3][:environment].should be_a(Puppet::Node::Environment)
     end
 
     it "should use the first field of the URI as the indirection name" do
-      handler.uri2indirection("GET", "/v3/foo/bar", params)[0].should == "foo"
+      handler.uri2indirection("GET", "/v3/node/bar", params)[0].name.should == :node
     end
 
     it "should fail if the indirection name is not alphanumeric" do
       lambda { handler.uri2indirection("GET", "/v3/foo ness/bar", params) }.should raise_error(ArgumentError)
     end
 
     it "should use the remainder of the URI as the indirection key" do
-      handler.uri2indirection("GET", "/v3/foo/bar", params)[2].should == "bar"
+      handler.uri2indirection("GET", "/v3/node/bar", params)[2].should == "bar"
     end
 
     it "should support the indirection key being a /-separated file path" do
-      handler.uri2indirection("GET", "/v3/foo/bee/baz/bomb", params)[2].should == "bee/baz/bomb"
+      handler.uri2indirection("GET", "/v3/node/bee/baz/bomb", params)[2].should == "bee/baz/bomb"
     end
 
     it "should fail if no indirection key is specified" do
-      lambda { handler.uri2indirection("GET", "/v3/foo", params) }.should raise_error(ArgumentError)
+      lambda { handler.uri2indirection("GET", "/v3/node", params) }.should raise_error(ArgumentError)
     end
 
     it "should choose 'find' as the indirection method if the http method is a GET and the indirection name is singular" do
-      handler.uri2indirection("GET", "/v3/foo/bar", params)[1].should == :find
+      handler.uri2indirection("GET", "/v3/node/bar", params)[1].should == :find
     end
 
     it "should choose 'find' as the indirection method if the http method is a POST and the indirection name is singular" do
-      handler.uri2indirection("POST", "/v3/foo/bar", params)[1].should == :find
+      handler.uri2indirection("POST", "/v3/node/bar", params)[1].should == :find
     end
 
     it "should choose 'head' as the indirection method if the http method is a HEAD and the indirection name is singular" do
-      handler.uri2indirection("HEAD", "/v3/foo/bar", params)[1].should == :head
+      handler.uri2indirection("HEAD", "/v3/node/bar", params)[1].should == :head
     end
 
     it "should choose 'search' as the indirection method if the http method is a GET and the indirection name is plural" do
-      handler.uri2indirection("GET", "/v3/foos/bar", params)[1].should == :search
+      handler.uri2indirection("GET", "/v3/nodes/bar", params)[1].should == :search
     end
 
     it "should change indirection name to 'status' if the http method is a GET and the indirection name is statuses" do
-      handler.uri2indirection("GET", "/v3/statuses/bar", params)[0].should == "status"
+      handler.uri2indirection("GET", "/v3/statuses/bar", params)[0].name.should == :status
     end
 
     it "should change indirection name to 'node' if the http method is a GET and the indirection name is nodes" do
-      handler.uri2indirection("GET", "/v3/nodes/bar", params)[0].should == "node"
+      handler.uri2indirection("GET", "/v3/nodes/bar", params)[0].name.should == :node
     end
 
     it "should choose 'delete' as the indirection method if the http method is a DELETE and the indirection name is singular" do
-      handler.uri2indirection("DELETE", "/v3/foo/bar", params)[1].should == :destroy
+      handler.uri2indirection("DELETE", "/v3/node/bar", params)[1].should == :destroy
     end
 
     it "should choose 'save' as the indirection method if the http method is a PUT and the indirection name is singular" do
-      handler.uri2indirection("PUT", "/v3/foo/bar", params)[1].should == :save
+      handler.uri2indirection("PUT", "/v3/node/bar", params)[1].should == :save
     end
 
     it "should fail if an indirection method cannot be picked" do
       lambda { handler.uri2indirection("UPDATE", "/v3/node/bar", params) }.should raise_error(ArgumentError)
     end
 
     it "should URI unescape the indirection key" do
       escaped = URI.escape("foo bar")
       indirection, method, key, final_params = handler.uri2indirection("GET", "/v3/node/#{escaped}", params)
       key.should == "foo bar"
     end
   end
 
   describe "when converting a request into a URI" do
     let(:environment) { Puppet::Node::Environment.create(:myenv, []) }
     let(:request) { Puppet::Indirector::Request.new(:foo, :find, "with spaces", nil, :foo => :bar, :environment => environment) }
 
     before do
       handler.stubs(:handler).returns "foo"
     end
 
     it "should include the environment in the query string of the URI" do
       handler.class.request_to_uri(request).should == "/v3/foo/with%20spaces?environment=myenv&foo=bar"
     end
 
     it "should pluralize the indirection name if the method is 'search'" do
       request.stubs(:method).returns :search
       handler.class.request_to_uri(request).split("/")[2].should == "foos"
     end
 
     it "should add the query string to the URI" do
       request.expects(:query_string).returns "query"
       handler.class.request_to_uri(request).should =~ /\&query$/
     end
   end
 
   describe "when converting a request into a URI with body" do
     let(:environment) { Puppet::Node::Environment.create(:myenv, []) }
     let(:request) { Puppet::Indirector::Request.new(:foo, :find, "with spaces", nil, :foo => :bar, :environment => environment) }
 
     it "should use the indirection as the first field of the URI" do
       handler.class.request_to_uri_and_body(request).first.split("/")[2].should == "foo"
     end
 
     it "should use the escaped key as the remainder of the URI" do
       escaped = URI.escape("with spaces")
       handler.class.request_to_uri_and_body(request).first.split("/")[3].sub(/\?.+/, '').should == escaped
     end
 
     it "should return the URI and body separately" do
       handler.class.request_to_uri_and_body(request).should == ["/v3/foo/with%20spaces", "environment=myenv&foo=bar"]
     end
   end
 
   describe "when processing a request" do
     it "should return not_authorized_code if the request is not authorized" do
       request = a_request_that_heads(Puppet::IndirectorTesting.new("my data"))
 
       handler.expects(:check_authorization).raises(Puppet::Network::AuthorizationError.new("forbidden"))
 
       handler.call(request, response)
 
       expect(response.code).to eq(not_authorized_code)
     end
 
     it "should return 'not found' if the indirection does not support remote requests" do
       request = a_request_that_heads(Puppet::IndirectorTesting.new("my data"))
 
       indirection.expects(:allow_remote_requests?).returns(false)
 
       handler.call(request, response)
 
       expect(response.code).to eq(not_found_code)
     end
 
-    it "should return 'not found' if the environment does not exist" do
+    it "should return 'bad request' if the environment does not exist" do
       Puppet.override(:environments => Puppet::Environments::Static.new()) do
         request = a_request_that_heads(Puppet::IndirectorTesting.new("my data"))
 
         handler.call(request, response)
 
-        expect(response.code).to eq(not_found_code)
+        expect(response.code).to eq(bad_request_code)
       end
     end
 
     it "should serialize a controller exception when an exception is thrown while finding the model instance" do
       request = a_request_that_finds(Puppet::IndirectorTesting.new("key"))
       handler.expects(:do_find).raises(ArgumentError, "The exception")
 
       handler.call(request, response)
 
-      expect(response.code).to eq(400)
+      expect(response.code).to eq(bad_request_code)
       expect(response.body).to eq("The exception")
       expect(response.type).to eq("text/plain")
     end
   end
 
   describe "when finding a model instance" do
     it "uses the first supported format for the response" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_finds(data, :accept_header => "unknown, pson")
 
       handler.call(request, response)
 
       expect(response.body).to eq(data.render(:pson))
       expect(response.type).to eq(Puppet::Network::FormatHandler.format(:pson))
     end
 
     it "responds with a not_acceptable_code error when no accept header is provided" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_finds(data, :accept_header => nil)
 
       handler.call(request, response)
 
       expect(response.code).to eq(not_acceptable_code)
     end
 
     it "raises an error when no accepted formats are known" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_finds(data, :accept_header => "unknown, also/unknown")
 
       handler.call(request, response)
 
       expect(response.code).to eq(not_acceptable_code)
     end
 
     it "should pass the result through without rendering it if the result is a string" do
       data = Puppet::IndirectorTesting.new("my data")
       data_string = "my data string"
       request = a_request_that_finds(data, :accept_header => "text/pson")
       indirection.expects(:find).returns(data_string)
 
       handler.call(request, response)
 
       expect(response.body).to eq(data_string)
       expect(response.type).to eq(Puppet::Network::FormatHandler.format(:pson))
     end
 
     it "should return a not_found_code when no model instance can be found" do
       data = Puppet::IndirectorTesting.new("my data")
       request = a_request_that_finds(data, :accept_header => "unknown, text/pson")
 
       handler.call(request, response)
       expect(response.code).to eq(not_found_code)
     end
   end
 
   describe "when searching for model instances" do
     it "uses the first supported format for the response" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_searches("my", :accept_header => "unknown, text/pson")
 
       handler.call(request, response)
 
       expect(response.type).to eq(Puppet::Network::FormatHandler.format(:pson))
       expect(response.body).to eq(Puppet::IndirectorTesting.render_multiple(:pson, [data]))
     end
 
     it "should return [] when searching returns an empty array" do
       request = a_request_that_searches("nothing", :accept_header => "unknown, text/pson")
 
       handler.call(request, response)
 
       expect(response.body).to eq("[]")
       expect(response.type).to eq(Puppet::Network::FormatHandler.format(:pson))
     end
 
     it "should return a not_found_code when searching returns nil" do
       request = a_request_that_searches("nothing", :accept_header => "unknown, text/pson")
       indirection.expects(:search).returns(nil)
 
       handler.call(request, response)
 
       expect(response.code).to eq(not_found_code)
     end
   end
 
   describe "when destroying a model instance" do
     it "destroys the data indicated in the request" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_destroys(data)
 
       handler.call(request, response)
 
       Puppet::IndirectorTesting.indirection.find("my data").should be_nil
     end
 
     it "responds with pson when no Accept header is given" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_destroys(data, :accept_header => nil)
 
       handler.call(request, response)
 
       expect(response.body).to eq(data.render(:pson))
       expect(response.type).to eq(Puppet::Network::FormatHandler.format(:pson))
     end
 
     it "uses the first supported format for the response" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_destroys(data, :accept_header => "unknown, text/pson")
 
       handler.call(request, response)
 
       expect(response.body).to eq(data.render(:pson))
       expect(response.type).to eq(Puppet::Network::FormatHandler.format(:pson))
     end
 
     it "raises an error and does not destroy when no accepted formats are known" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_destroys(data, :accept_header => "unknown, also/unknown")
 
       handler.call(request, response)
 
       expect(response.code).to eq(not_acceptable_code)
       Puppet::IndirectorTesting.indirection.find("my data").should_not be_nil
     end
   end
 
   describe "when saving a model instance" do
     it "allows an empty body when the format supports it" do
       class Puppet::IndirectorTesting::Nonvalidatingmemory < Puppet::IndirectorTesting::Memory
         def validate_key(_)
           # nothing
         end
       end
 
       indirection.terminus_class = :nonvalidatingmemory
 
       data = Puppet::IndirectorTesting.new("test")
       request = a_request_that_submits(data,
                                        :content_type_header => "application/x-raw",
                                        :body => '')
 
       handler.call(request, response)
 
       # PUP-3272 this test fails when yaml is removed and pson is used. Instead of returning an
       # empty string, the a string '""' is returned - Don't know what the expecation is, if this is
       # corrent or not.
       # (helindbe)
       #
       Puppet::IndirectorTesting.indirection.find("test").name.should == ''
     end
 
     it "saves the data sent in the request" do
       data = Puppet::IndirectorTesting.new("my data")
       request = a_request_that_submits(data)
 
       handler.call(request, response)
 
       saved = Puppet::IndirectorTesting.indirection.find("my data")
       expect(saved.name).to eq(data.name)
     end
 
     it "responds with pson when no Accept header is given" do
       data = Puppet::IndirectorTesting.new("my data")
       request = a_request_that_submits(data, :accept_header => nil)
 
       handler.call(request, response)
 
       expect(response.body).to eq(data.render(:pson))
       expect(response.type).to eq(Puppet::Network::FormatHandler.format(:pson))
     end
 
     it "uses the first supported format for the response" do
       data = Puppet::IndirectorTesting.new("my data")
       request = a_request_that_submits(data, :accept_header => "unknown, text/pson")
 
       handler.call(request, response)
 
       expect(response.body).to eq(data.render(:pson))
       expect(response.type).to eq(Puppet::Network::FormatHandler.format(:pson))
     end
 
     it "raises an error and does not save when no accepted formats are known" do
       data = Puppet::IndirectorTesting.new("my data")
       request = a_request_that_submits(data, :accept_header => "unknown, also/unknown")
 
       handler.call(request, response)
 
       expect(Puppet::IndirectorTesting.indirection.find("my data")).to be_nil
       expect(response.code).to eq(not_acceptable_code)
     end
   end
 
   describe "when performing head operation" do
     it "should not generate a response when a model head call succeeds" do
       data = Puppet::IndirectorTesting.new("my data")
       indirection.save(data, "my data")
       request = a_request_that_heads(data)
 
       handler.call(request, response)
 
       expect(response.code).to eq(nil)
     end
 
     it "should return a not_found_code when the model head call returns false" do
       data = Puppet::IndirectorTesting.new("my data")
       request = a_request_that_heads(data)
 
       handler.call(request, response)
 
       expect(response.code).to eq(not_found_code)
       expect(response.type).to eq("text/plain")
       expect(response.body).to eq("Not Found: Could not find indirector_testing my data")
     end
   end
 end
diff --git a/spec/unit/network/http/api/v3_spec.rb b/spec/unit/network/http/api/v3_spec.rb
index f655c2cd4..099a76a22 100755
--- a/spec/unit/network/http/api/v3_spec.rb
+++ b/spec/unit/network/http/api/v3_spec.rb
@@ -1,24 +1,32 @@
 require 'spec_helper'
 
 require 'puppet/network/http'
 
 describe Puppet::Network::HTTP::API::V3 do
   let(:response) { Puppet::Network::HTTP::MemoryResponse.new }
 
   it "mounts the environments endpoint" do
     request = Puppet::Network::HTTP::Request.from_hash(:path => "/v3/environments")
     Puppet::Network::HTTP::API::V3.routes.process(request, response)
 
     expect(response.code).to eq(200)
   end
 
   it "mounts indirected routes" do
     request = Puppet::Network::HTTP::Request.
         from_hash(:path => "/v3/node/foo",
                   :params => {:environment => "production"},
                   :headers => {"accept" => "text/pson"})
     Puppet::Network::HTTP::API::V3.routes.process(request, response)
 
     expect(response.code).to eq(200)
   end
+
+  it "responds to unknown paths with a 404" do
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "/v3/unknown")
+
+    Puppet::Network::HTTP::API::V3.routes.process(request, response)
+    expect(response.code).to eq(404)
+    expect(response.body).to match("Not Found: Could not find indirection 'unknown'")
+  end
 end