handle other store edge cases