refactor: Ensure findById returns null instead of an array when ID is null#1263