Making unsafe safer