Add exceptions and *Aware