Added trap statement