Fix bug when trap-error form was not top-level