diff --git a/src/yappari-application/Whatsapp/bintreenodereader.cpp b/src/yappari-application/Whatsapp/bintreenodereader.cpp
index 6d32774..3c10fcf 100644
--- a/src/yappari-application/Whatsapp/bintreenodereader.cpp
+++ b/src/yappari-application/Whatsapp/bintreenodereader.cpp
@@ -55,9 +55,6 @@ bool BinTreeNodeReader::getOneToplevelStream()
     }
 
     //qDebug() << "[[ " + readBuffer.toHex();
-    if (decodedStream.isOpen()) {
-        decodedStream.close();
-    }
 
     if (decodeRawStream(flags, 0, bufferSize)) {
         decodedStream.setBuffer(&decodedBuffer);
@@ -146,6 +143,9 @@ bool BinTreeNodeReader::nextTree(ProtocolTreeNode& node)
     node.setSize(getOneToplevelStreamSize());
 
     result = nextTreeInternal(node);
+    if (decodedStream.isOpen()) {
+        decodedStream.close();
+    }
     Utilities::logData("INCOMING:\n" + node.toString());
     return result;
 }

diff --git a/src/yappari-application/yappari-application.pro b/src/yappari-application/yappari-application.pro
index 761c7c7..0c9c0ab 100644
--- a/src/yappari-application/yappari-application.pro
+++ b/src/yappari-application/yappari-application.pro
@@ -34,7 +34,7 @@
 #-------------------------------------------------

 QT          += core gui network sql maemo5 phonon
-CONFIG      += mobility qtdbus network link_pkgconfig
+CONFIG      += mobility qtdbus network link_pkgconfig debug
 MOBILITY     = systeminfo messaging
 PKGCONFIG   += libosso-abook-1.0 libebook-1.2 gtk+-2.0 gstreamer-0.10 libpulse libexif
 INCLUDEPATH += /usr/include/libosso-abook-1.0 /usr/include/evolution-data-server-1.4/ /usr/include/gtk-2.0 /usr/include/gstreamer-0.10