change __str__ to always use display name when possible
Make lock/suspend errors retriable