Refactor away unnecessary multiple return None

What do you think about getting rid of the multiple return None lines?