Better exception handling for release switching block