Minor addition to check for null on upTo