Fixing connector and resource exception handling
Merge branch '1_2_X'