[ros-dev] Trap handler rewrite