diff -r 3c572d238d9e -r 9f8166238993 scansion/objects/client.lua
--- a/scansion/objects/client.lua	Sat Sep 19 21:49:03 2015 +0100
+++ b/scansion/objects/client.lua	Sat Sep 19 21:50:11 2015 +0100
@@ -56,10 +56,10 @@
 		local expected_stanza = fill_vars(client.script, assert(parse_xml((table.concat(data):gsub("\t", "  ")))));
 		local function stanza_handler(received_stanza)
 			if not stanzacmp.stanzas_match(expected_stanza, received_stanza) then
-				verse.quit();
 				client.log("NOT IT!")
 				client.log("Expected: %s", expected_stanza);
 				client.log("Received: %s", received_stanza);
+				error("Received unexpected stanza");
 			else
 				client.log("YES! %s", expected_stanza)
 			end
@@ -69,6 +69,7 @@
 		verse.add_task(stanza_timeout, function ()
 			if not expected_stanza then return; end
 			client.log("TIMEOUT waiting for %s", expected_stanza)
+			error("Timed out waiting for stanza");
 		end);
 	end;