exception handling and parser bug fixed

No match.