Avoid error when an item is not found with open
Move logic around
Change copy
Add a test