Fix exception handling
New tokenizer implementation
Refactoring: remove dummy splitter implementation