Merge branch 'master' of git://reductivelabs.com/puppet into routing

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/puppet/indirector/code/configuration.rb b/lib/puppet/indirector/code/configuration.rb
index 2d8fedcc8..949926a3c 100644
--- a/lib/puppet/indirector/code/configuration.rb
+++ b/lib/puppet/indirector/code/configuration.rb
@@ -21,9 +21,13 @@ class Puppet::Indirector::Code::Configuration < Puppet::Indirector::Code
             node = find_node(key)
         end
 
-        configuration = compile(node)
-
-        return configuration
+        if configuration = compile(node)
+            return configuration.to_transportable
+        else
+            # This shouldn't actually happen; we should either return
+            # a config or raise an exception.
+            return nil
+        end
     end
 
     def initialize