diff --git a/Property/Cmd.hs b/Property/Cmd.hs
index 0a4a5ba..278d2fb 100644
--- a/Property/Cmd.hs
+++ b/Property/Cmd.hs
@@ -32,4 +32,4 @@ cmdProperty' cmd params env = Property desc $ do
 scriptProperty :: [String] -> Property
 scriptProperty script = cmdProperty "sh" [Param "-c", Param shellcmd]
   where
-	shellcmd = intercalate " && " script
+	shellcmd = intercalate " ; " ("set -e" : script)
diff --git a/Property/JoeySites.hs b/Property/JoeySites.hs
index 35d5109..550c79e 100644
--- a/Property/JoeySites.hs
+++ b/Property/JoeySites.hs
@@ -9,7 +9,7 @@ import qualified Property.Apt as Apt
 oldUseNetshellBox :: Property
 oldUseNetshellBox = check (not <$> Apt.isInstalled "oldusenet") $
 	propertyList ("olduse.net shellbox")
-		[ Apt.installed (words "build-essential git ghc libghc-strptime-dev libghc-hamlet-dev libghc-ifelse-dev libghc-hxt-dev libghc-utf8-string-dev libghc-missingh-dev libghc-sha-dev")
+		[ Apt.installed (words "build-essential debhelper git ghc libghc-strptime-dev libghc-hamlet-dev libghc-ifelse-dev libghc-hxt-dev libghc-utf8-string-dev libghc-missingh-dev libghc-sha-dev")
 			`describe` "olduse.net build deps"
 		, scriptProperty
 			[ "git clone git://olduse.net/ /root/tmp/oldusenet/source"