#
#
# patch "src/util/BasicIOWriter.cpp"
#  from [ab4c05235a87cca8c82024a143568e2e567d973b]
#    to [7965db7212e1d26f78c7923a3c8add0fd8dd46b7]
# 
# patch "src/vocab.h"
#  from [e150d1f8366d29c1fb517be3cbddc54cadcf7092]
#    to [ab57a84a83e9f31da97f870d480a9e92528bbe11]
#
============================================================
--- src/util/BasicIOWriter.cpp	ab4c05235a87cca8c82024a143568e2e567d973b
+++ src/util/BasicIOWriter.cpp	7965db7212e1d26f78c7923a3c8add0fd8dd46b7
@@ -40,7 +40,7 @@ QString BasicIOWriter::writeStanza(const
     foreach (StanzaEntry en, stanza)
     {
         // ensure that not both, a hash and a value list, are given
-        I(!(en.hash.isNull() && en.vals.size() > 0));
+        I(!(!en.hash.isNull() && en.vals.size() > 0));
         
         if (!en.hash.isNull())
         {
============================================================
--- src/vocab.h	e150d1f8366d29c1fb517be3cbddc54cadcf7092
+++ src/vocab.h	ab57a84a83e9f31da97f870d480a9e92528bbe11
@@ -33,7 +33,8 @@ class Guitone;
 #define C(msg) DebugLog::critical(QString("%1:%2:%3: %4") \
         .arg(__FILE__).arg(__FUNCTION__).arg(__LINE__).arg(QString(msg)))
 #define F(msg) DebugLog::fatal(QString("%1:%2:%3: %4") \
-        .arg(__FILE__).arg(__FUNCTION__).arg(__LINE__).arg(QString(msg)))
+        .arg(__FILE__).arg(__FUNCTION__).arg(__LINE__).arg(QString(msg))); \
+        abort()
 
 #define I(expr) if (!(expr)) F(QString("invariant \"%1\" violated").arg(#expr))