Revert "Revert "extra safety check to storage open""

This reverts commit ff9b42d0f26b90a84715d1ccb8dc68644f71019a.