locksmith: now with less crashing