Handle the None case down river too