Bug fixes:

Thrift exception handling
Valgrind errors