improve code paths when trying to unlock a volume