new exceptions and slightly altered icon handling.