Exceptions refactoring, annotations for fsreader package