Bug fixes!

This fixes an issue when your Puppet report isn't absolutely perfect. I don't know what it is doing, but this should be more robust.