Explicitly return None

The output is the same as before, just more explicit in what we return.
Don't mix NoneType/strings with integer comparison

This works in Python2 but breaks in Python3.