added query string to exception
improved decompiling code