Added tracking of exceptions