Fix typo and return None for objects with no id