fix NPE caused because a null (not an empty collection) may be returned when getting markers
2 files changed