Preventing problem with the None case