Fixed lots of exceptions