exceptions and parser added