Adaptation to the Iconnector Interface refactor, and added support to CriticalExceptions