Another option would be to guard the appropriate places with a feature flag; then you wouldn't have to do as much exception handling.