Skip to content

more null checks

more null checks #419