--- a/src/relpipe-tr-sed.cpp	Mon Dec 10 00:06:54 2018 +0100
+++ b/src/relpipe-tr-sed.cpp	Mon Dec 10 17:28:53 2018 +0100
@@ -32,32 +32,32 @@
 #include <relpipe/writer/Factory.h>
 #include <relpipe/writer/TypeId.h>
 
-#include "PassthroughHandler.h"
+#include "SedHandler.h"
 
 using namespace relpipe::cli;
 using namespace relpipe::reader;
-using namespace relpipe::tr::validator;
+using namespace relpipe::tr::sed;
 
 int main(int argc, char**argv) {
 	setlocale(LC_ALL, "");
 	CLI::untieStdIO();
 	CLI cli(argc, argv);
-	
+
 	int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR;
 
 	try {
 		std::shared_ptr<RelationalReader> reader(Factory::create(std::cin));
-		PassthroughHandler handler(std::cout);
+		SedHandler handler(std::cout, cli.arguments());
 		reader->addHandler(&handler);
 		reader->process();
 
 		resultCode = CLI::EXIT_CODE_SUCCESS;
 
-	} catch (RelpipeCLIException e) {
+	} catch (RelpipeCLIException& e) {
 		fwprintf(stderr, L"Caught CLI exception: %ls\n", e.getMessge().c_str());
 		fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount());
 		resultCode = e.getExitCode();
-	} catch (RelpipeReaderException e) {
+	} catch (RelpipeReaderException& e) {
 		fwprintf(stderr, L"Caught Reader exception: %ls\n", e.getMessge().c_str());
 		fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount());
 		resultCode = CLI::EXIT_CODE_DATA_ERROR;