added check for null bottle