Added support for Tapstream
Using more idiomatic exceptions