Added better checks for store existence