Fixed Exception in joint.destroy(); minor clean up