removed out commented exception wrapping