2 Years Ago
Additional null checks