Is this the right behavior if it returns None?