2 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/network/format_handler.rb b/lib/puppet/network/format_handler.rb
index 17b863fda..2ffbcef3d 100644
--- a/lib/puppet/network/format_handler.rb
+++ b/lib/puppet/network/format_handler.rb
@@ -81,9 +81,10 @@ module Puppet::Network::FormatHandler
             out = format
         when %r{\w+/\w+}
             out = mime(format)
-        when
+        else
             out = format(format)
         end
+        raise ArgumentError, "No format match the given format name or mime-type (%s)" % format if out.nil?
         out.name
     end
 
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
index 27e8dbd1d..817661db1 100644
--- a/lib/puppet/network/http/handler.rb
+++ b/lib/puppet/network/http/handler.rb
@@ -42,7 +42,9 @@ module Puppet::Network::HTTP::Handler
 
     def request_format(request)
         if header = content_type_header(request)
+            header.gsub!(/\s*;.*$/,'') # strip any charset
             format = Puppet::Network::FormatHandler.mime(header)
+            raise "Client sent a mime-type (%s) that doesn't correspond to a format we support" % header if format.nil?
             return format.name.to_s if format.suitable?
         end