Added additional trapping