Adds more safety catches and enables Vicon help