Bugfix

return None needs to pass the whole way up the chain