Not sure if I'm being overly cautious but should we check for None on a few of the arguments passed in?