[ros-diffs] [cwittich] 25061: -replaced some really stupid code -added error handling