Removes Issue #4: Eating exception during wrap/unwrap