Making ROS lib file a little more robust.