Removed one of the performance enh due to regression when propagating exceptions