diff --git a/Main.hs b/Main.hs
--- a/Main.hs
+++ b/Main.hs
@@ -99,7 +99,7 @@
 >>> queryfunc "test.nod" >>= diff reference
 
 -}
-module Main (initializedaemon, diff, main) where 
+module Main (initializedaemon, diff, main) where
 
 import System.Environment
 import Puppet.Init
@@ -118,6 +118,7 @@
 import Control.Monad.Error (runErrorT)
 import Puppet.DSL.Printer
 import Data.Char (toLower)
+import Puppet.Testing
 
 usage = error "Usage: puppetresource puppetdir nodename [filename]"
 
@@ -130,7 +131,7 @@
 initializedaemonWithPuppet purl puppetdir = do
     LOG.updateGlobalLogger "Puppet.Daemon" (LOG.setLevel LOG.INFO)
     prefs <- genPrefs puppetdir
-    queryfunc <- initDaemon (prefs { puppetDBurl = purl })
+    (queryfunc, _, _, _) <- initDaemon (prefs { puppetDBurl = purl })
     return (\nodename -> do
         o <- allFacts nodename >>= queryfunc nodename
         case o of
@@ -276,6 +277,10 @@
 
     queryfunc <- initializedaemonWithPuppet puppeturl puppetdir
     x <- queryfunc nodename
+    tests <- testCatalog puppetdir x []
+    case tests of
+        Right _ -> return ()
+        Left rr -> error rr
     if length rargs == 3
         then handlePrintResource (rargs !! 2) x
         else putStrLn $ showFCatalog x
diff --git a/puppetresources.cabal b/puppetresources.cabal
--- a/puppetresources.cabal
+++ b/puppetresources.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                puppetresources
-version:             0.3.5
+version:             0.3.6
 synopsis:            A program that displays the puppet resources associated to a node given .pp files.
 -- description:         
 license:             GPL-3
@@ -15,13 +15,17 @@
 build-type:          Simple
 cabal-version:       >=1.8
 
+source-repository head
+  type: git
+  location: git://github.com/bartavelle/puppetresources.git
+
 executable puppetresources
   extensions:          BangPatterns
   main-is:             Main.hs
   ghc-options:         -rtsopts
   -- other-modules:       
   build-depends:       base >=3 && <5,
-                       language-puppet >= 0.2.0,
+                       language-puppet >= 0.2.2.0,
                        hsfacter        >= 0.2.0.0,
                        containers,
                        hslogger,